From 61ee6b47a395b21cc99f4a2791c1370c88336abe Mon Sep 17 00:00:00 2001 From: Manuel Hiebel Date: Sat, 1 Feb 2014 09:20:35 +0000 Subject: Mageia 4 final is here --- en/3/for-pc/index.php | 98 ++++++++++++++ en/3/for-server/index.php | 53 ++++++++ en/3/index.php | 4 +- en/3/nav.php | 6 +- en/4/download_index.php | 122 +++++++++--------- en/4/index.php | 103 ++++++++++++++- en/4/nav.php | 7 +- en/5/download_index.php | 269 +++++++++++++++++++++++++++++++++++++++ en/5/index.php | 1 + en/5/nav.php | 24 ++++ en/downloads/get/definitions.ini | 173 +++++++++++++------------ en/downloads/index.php | 2 +- en/for-pc/index.php | 98 -------------- en/for-server/index.php | 53 -------- en/index.php | 18 ++- en/map/index.php | 3 +- en/support/index.php | 5 +- 17 files changed, 714 insertions(+), 325 deletions(-) create mode 100644 en/3/for-pc/index.php create mode 100644 en/3/for-server/index.php create mode 100755 en/5/download_index.php create mode 100644 en/5/index.php create mode 100644 en/5/nav.php delete mode 100644 en/for-pc/index.php delete mode 100644 en/for-server/index.php (limited to 'en') diff --git a/en/3/for-pc/index.php b/en/3/for-pc/index.php new file mode 100644 index 000000000..3e90bd5dd --- /dev/null +++ b/en/3/for-pc/index.php @@ -0,0 +1,98 @@ + + + + + + <?php _e('Mageia 3, for your PC')?> + + + + + + +

Mageia 3 »

+ +
+
+ +
    +
  • KDE4 SC 4.10.2,
  • +
  • GNOME 3.6,
  • +
  • XFCE 4.10,
  • +
  • LXDE,
  • +
  • Razor-Qt,
  • +
  • E17.
  • +
+ +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ Mageia 3 Release notes.', array('https://wiki.mageia.org/en/Mageia_3_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/3/for-server/index.php b/en/3/for-server/index.php new file mode 100644 index 000000000..3cfc3958e --- /dev/null +++ b/en/3/for-server/index.php @@ -0,0 +1,53 @@ + + + + + + <?php _e('Mageia 3, for your server')?> + + + + + + +

Mageia 3 »

+ +
+
+ Mageia App DB.', array('http://mageia.madb.org')); + + _h('Administration', null, 'h3'); + _h('For centralised administration, we include puppet 2.7.21; we use it widely in our own infrastructure.', array('//svnweb.mageia.org/adm/puppet/')); + + _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.17; MariaDB 5.5.28, which replaces MySQL; BDB.'); + _h('And there are NoSQL servers too: CouchDB 1.2.1, Redis 2.6.5, MongoDB 2.2.2.'); + + _h('Servers', null, 'h3'); + _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.'); + ?> +
+
+
+ Mageia 3 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/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');
- Mageia 3 + Mageia 3 Mageia community.', array('../community')); _h('What\'s new?', null, 'h2'); _h('Too much to include here! See the release notes for an extensive exposé.'); ?> -

+

_t('Mageia 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 @@ %s', - get_mageia_image_file_name($name, $version, $release, $variant, $arch, $medium, '.iso'), + get_mageia_image_file_name($variant, $arch, $medium, '.iso'), $torrent ? '&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 - <?php echo sprintf(_t('Download') . ' %s %s %s',$name, $version, $release)?> + <?php echo sprintf(_t('Download') . 'Mageia 4')?> - + - -

%s %s %s',$name, $version, $release)?>

- -

DO NOT USE THIS IN PRODUCTION OR FOR OFFICIAL REVIEW.');?> -

+

Mageia 4')?>

+
@@ -91,26 +75,26 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me DVD 32bit
DVD 64bit
- : GNOME, KDE, XFCE, Mate, Cinnamon, LXDE, ... - 3.9GB + : GNOME, KDE, XFCE, Mate, Cinnamon, LXDE, ... + 3.7GB - '; - dl_link($name,$version,$release,null,'x86_64','DVD',false); + dl_link(null,'x86_64','DVD',false); echo ''; - dl_link($name,$version,$release,null,'i586','DVD',true); + dl_link(null,'i586','DVD',true); echo '
'; - dl_link($name,$version,$release,null,'x86_64','DVD',true);?> + dl_link(null,'x86_64','DVD',true);?> DVD dualarch
- : XFCE + : XFCE 1GB - + - + @@ -136,7 +120,7 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me

- upgrade guide.', array('https://wiki.mageia.org/en/Mageia_4_Release_Notes#Upgrading_from_Mageia_3'));*/?>

+ upgrade guide.', array('https://wiki.mageia.org/en/Mageia_4_Release_Notes#Upgrading_from_Mageia_3'));?>

@@ -152,13 +136,13 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me @@ -166,22 +150,22 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me @@ -189,9 +173,9 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me @@ -201,8 +185,7 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me

-

wired network or a local disk.')?> -

+

wired network or a local disk.')?>

1.4GB - '; - dl_link($name,$version,$release,'LiveDVD-KDE4','x86_64','DVD',false); + dl_link('LiveDVD-KDE4','x86_64','DVD',false); echo ''; - dl_link($name,$version,$release,'LiveDVD-KDE4','i586','DVD',true); + dl_link('LiveDVD-KDE4','i586','DVD',true); echo '
'; - dl_link($name,$version,$release,'LiveDVD-KDE4','x86_64','DVD',true);?> + dl_link('LiveDVD-KDE4','x86_64','DVD',true);?>
1.4GB - '; - dl_link($name,$version,$release,'LiveDVD-GNOME','x86_64','DVD',false); + dl_link('LiveDVD-GNOME','x86_64','DVD',false); echo ''; - dl_link($name,$version,$release,'LiveDVD-GNOME','i586','DVD',true); + dl_link('LiveDVD-GNOME','i586','DVD',true); echo '
'; - dl_link($name,$version,$release,'LiveDVD-GNOME','x86_64','DVD',true);?> + dl_link('LiveDVD-GNOME','x86_64','DVD',true);?>
LiveCD KDE
700MB - '; - dl_link($name,$version,$release,'LiveCD-KDE4-en','i586','CD',true);?> + dl_link('LiveCD-KDE4-en','i586','CD',true);?>
700MB - '; - dl_link($name,$version,$release,'LiveCD-GNOME-en','i586','CD',true);?> + dl_link('LiveCD-GNOME-en','i586','CD',true);?>
@@ -215,43 +198,56 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me - - + - - +
~27MB27MB
53MB
'; - dl_link($name,$version,$release,'Boot','x86_64','CD',false);?> + dl_link('Boot','x86_64','CD',false);?>

~36MB37MB
74MB
'; - dl_link($name,$version,$release,'Boot-nonfree','x86_64','CD',false);?> + dl_link('Boot-nonfree','x86_64','CD',false);?>
- -
+

Mageia 4

+ st 2014')?>
    -
  • Release notes', array('https://wiki.mageia.org/en/',$name,$version,$release))?>
  • +
  • Release notes', array('https://wiki.mageia.org/en/','Mageia',4,'Release_Notes'))?>
  • Errata', array('https://wiki.mageia.org/en/Mageia_4_Errata'))?>
  • Which to choose', array('https://wiki.mageia.org/en/Installation_Media'))?>
  • Get ISO on USB flash stick', array('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_stick.3F'))?>
  • -
  • Mageia 4', array('../contribute/'))?>
  • +
  • Here\'s a wiki page for you.', array('https://wiki.mageia.org/en/Newcomers_start_here'))?>


+ from Mageia 3?', null, 'h3')?> +
    do not use LiveCDs;', null, 'li'); + _h('see the upgrade guide', array('https://wiki.mageia.org/en/Mageia_4_Release_Notes#Upgrading_from_Mageia_3'), 'li'); + ?>
+
+
'; - _e('It is here.', array('../downloads/')); - echo '

'; + _e('It is here now.', array('../3/')); + /*echo '', _t('But please remember that it already reached EOL.',array('https://blog.mageia.org/en/2013/11/21/farewell-mageia-2/')) . ''; */?> +

+
+
+ help us on Mageia 5.', array('../contribute/','../contribute/')); ?>

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 _e('Mageia 4')?> + + + + + + + + + + + +

Mageia 4

+ +
+
+
+
+
+ +Mageia community. It can be installed in several ways, with the Live or Classical ISOs being the most popular methods.', array('../community'));?> + +

+ +these instructions 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 documentation 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 Mageia Application Database 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 release notes 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 MageiaWelcome.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 custom desktop choice.',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.'); + ?> +
+
+ +
+ +
+ + Mageia.org nonprofit organisation, which is governed by a body of recognized and elected contributors.',array('../about/')); + + _h('Mageia 4 has been made by more than 100 people from all around the world.',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 join us.', array('../contribute')); + ?> +
+ +
+
+ + + 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 @@ _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 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 @@ +%s', + get_mageia_image_file_name($name, $version, $release, $variant, $arch, $medium, '.iso'), + $torrent ? '&torrent=1' : '', + implode(' ', array($name, $version, $release, $variant, $arch, $medium)), + $bit + ); */ +} + +?> + + + + + + <?php echo sprintf(_t('Download') . ' %s %s %s',$name, $version, $release)?> + + + + + + + + + + +

%s %s %s',$name, $version, $release)?>

+ +

DO NOT USE THIS IN PRODUCTION OR FOR OFFICIAL REVIEW.');?> +

+
+
+
+
+
+

+ + + + + + + + + + + + + + + + + + + + + +
DVD 32bit
DVD 64bit
+ : GNOME, KDE, XFCE, Mate, Cinnamon, LXDE, ...
3.9GB + '; + dl_link($name,$version,$release,null,'x86_64','DVD',false); + echo ''; + dl_link($name,$version,$release,null,'i586','DVD',true); + echo '
'; + dl_link($name,$version,$release,null,'x86_64','DVD',true);?> +
DVD dualarch
+ : XFCE
1GB + + + +
+ +

+
    +
  • + + Deutsch, English, español, français, italiano, português, svenska, nederlands, + polski, dansk, Русский + + .
  • +
  • +
  • +
+
+ +
+

+

+ + upgrade guide.', array('https://wiki.mageia.org/en/Mageia_4_Release_Notes#Upgrading_from_Mageia_3'));*/?>

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
LiveDVD KDE
+
1.4GB + '; + dl_link($name,$version,$release,'LiveDVD-KDE4','x86_64','DVD',false); + echo ''; + dl_link($name,$version,$release,'LiveDVD-KDE4','i586','DVD',true); + echo '
'; + dl_link($name,$version,$release,'LiveDVD-KDE4','x86_64','DVD',true);?> +
LiveDVD GNOME
+
1.4GB + '; + dl_link($name,$version,$release,'LiveDVD-GNOME','x86_64','DVD',false); + echo ''; + dl_link($name,$version,$release,'LiveDVD-GNOME','i586','DVD',true); + echo '
'; + dl_link($name,$version,$release,'LiveDVD-GNOME','x86_64','DVD',true);?> +
LiveCD KDE
+
700MB + '; + dl_link($name,$version,$release,'LiveCD-KDE4-en','i586','CD',true);?> +
LiveCD GNOME
+
700MB + '; + dl_link($name,$version,$release,'LiveCD-GNOME-en','i586','CD',true);?> +
+ +
+ +
+

+

wired network or a local disk.')?> +

+ + + + + + + + + + + + + + + + + + + + + +
~27MB'; + dl_link($name,$version,$release,'Boot','x86_64','CD',false);?> +

+
~36MB'; + dl_link($name,$version,$release,'Boot-nonfree','x86_64','CD',false);?> +
+ + +
+
+
+
+
    +
  • Release notes', array('https://wiki.mageia.org/en/',$name,$version,$release))?>
  • +
  • Errata', array('https://wiki.mageia.org/en/Mageia_4_Errata'))?>
  • +
  • Which to choose', array('https://wiki.mageia.org/en/Installation_Media'))?>
  • +
  • Get ISO on USB flash stick', array('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_stick.3F'))?>
  • +
  • Here\'s a wiki page for you.', array('https://wiki.mageia.org/en/Newcomers_start_here'))?>
  • +
  • ',"$name $version";?>
  • + +
+
+
+ '; + _e('It is here.', array('../downloads/')); + echo '

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

    Mageia 3 »

    - -
    -
    - -
      -
    • KDE4 SC 4.10.2,
    • -
    • GNOME 3.6,
    • -
    • XFCE 4.10,
    • -
    • LXDE,
    • -
    • Razor-Qt,
    • -
    • E17.
    • -
    - -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    - Mageia 3 Release notes.', array('https://wiki.mageia.org/en/Mageia_3_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/for-server/index.php b/en/for-server/index.php deleted file mode 100644 index 8c241ded8..000000000 --- a/en/for-server/index.php +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - <?php _e('Mageia 3, for your server')?> - - - - - - -

    Mageia 3 »

    - -
    -
    - Mageia App DB.', array('http://mageia.madb.org')); - - _h('Administration', null, 'h3'); - _h('For centralised administration, we include puppet 2.7.21; we use it widely in our own infrastructure.', array('//svnweb.mageia.org/adm/puppet/')); - - _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.17; MariaDB 5.5.28, which replaces MySQL; BDB.'); - _h('And there are NoSQL servers too: CouchDB 1.2.1, Redis 2.6.5, MongoDB 2.2.2.'); - - _h('Servers', null, 'h3'); - _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.'); - ?> -
    -
    -
    - Mageia 3 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/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 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( Mageia 3 - +

    - Release notes', array('https://wiki.mageia.org/en/Mageia_3_Release_Notes')); ?>, - errata', array('https://wiki.mageia.org/en/Mageia_3_Errata')); ?>. + Release notes', array('https://wiki.mageia.org/en/Mageia_4_Release_Notes')); ?>, + errata', array('https://wiki.mageia.org/en/Mageia_4_Errata')); ?>.

  • Get involved in the next version'); ?>
  • -
  • Mageia 4 RC -
  • +
    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 '
      '; - _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 '
    '; echo '
    '; -- cgit v1.2.1