<?php echo sprintf(_t('Download') . 'Mageia 4')?>

- - - - + + + + + : GNOME, KDE, XFCE, Mate, Cinnamon, LXDE, ... - - + + + : XFCE - +


DVD 32bit DVD 64bit - : GNOME, KDE, XFCE, Mate, Cinnamon, LXDE, ...	3.7GB	- '; - dl_link(null,'x86_64','DVD',false); - echo '	'; - dl_link(null,'i586','DVD',true); - echo ' '; - dl_link(null,'x86_64','DVD',true);?> -
+ '; + dl_link(null,'x86_64','DVD',false); + echo '	'; + dl_link(null,'i586','DVD',true); + echo ' '; + dl_link(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($upgradeguide));?>

+ + upgrade guide.', array($upgradeguide));?>

- - - - + + + + + - + + - + + - + + - @@ -184,34 +184,34 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un

wired network or a local disk.')?>


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

- - - + + + - + - + - + - +


		27MB 53MB	'; - dl_link('Boot','x86_64','CD',false);?> -	'; + dl_link('Boot','x86_64','CD',false);?> +
-	+	37MB 74MB	'; - dl_link('Boot-nonfree','x86_64','CD',false);?> -	'; + dl_link('Boot-nonfree','x86_64','CD',false);?> +

@@ -220,34 +220,34 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un

Mageia 4

- st 2014')?> + st 2014', null, 'p')?>

Release notes', array($releasenotes))?>
Errata', array($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'))?>
Release notes', array($releasenotes))?>
Errata', array($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'))?>

- from Mageia 3?', null, 'h3')?> + from Mageia 3?', null, 'h3')?>

upgrade guide

do not

upgrade guide

'; - _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/')) . ''; */?> + _g('It is here now.', array('../3/')); + /*_r('But please remember that it already reached EOL.',array('https://blog.mageia.org/en/2013/11/21/farewell-mageia-2/'), 'span class="warn"'); */?>

help us on Mageia 5.', array('../contribute/','../contribute/')); + _g('Need more challenge?', null, 'h3'); + _g('You can help us on Mageia 5.', array('../contribute/','../contribute/'), 'p'); ?>

diff --git a/en/4/index.php b/en/4/index.php index 1aa35f7ca..15acddace 100644 --- a/en/4/index.php +++ b/en/4/index.php @@ -3,15 +3,15 @@ define('HLANG', true); require '../../langs.php'; -_lang_load($locale, '4'); +$dictionary = read_translation_file($locale, '4'); ?> - <?php _e('Mageia 4')?> + <?php _g('Mageia 4')?> - + @@ -29,33 +29,33 @@ _lang_load($locale, '4');

-Mageia community. It can be installed in several ways, with the Live or Classical ISOs being the most popular methods.', array('../community'));?> + _g('Mageia 4 is a GNU/Linux distribution for your computer, released by the Mageia community. It can be installed in several ways, with the Live or Classical ISOs being the most popular methods.', array('../community'), 'p');?> -

-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.'); +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'), 'p'); + _g('If you are happy with the Mageia experience, you can then install it onto your hard drive from the Live media.', null, 'p'); - _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/')); + _g('The Classical ISO is the more traditional way to install Mageia directly. Take a look at the complete documentation for this installer.', array('../doc/'), 'p'); - _h('Mageia 4 includes several desktop managers including KDE, Gnome, XFCE, Mate, and Cinnamon.'); + _g('Mageia 4 includes several desktop managers including KDE, Gnome, XFCE, Mate, and Cinnamon.', null, 'p'); - _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')); + _g('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'), 'p'); - _h('What\'s new?', null, 'h2'); + _g('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($releasenotes)); + _g('There\'s plenty of new goodness in Mageia 4, too much to include here - see the release notes for an extensive exposé.',array($releasenotes), 'p'); - _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')); + _g('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'), 'p'); require '../doc/doc.php'; - _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/' . doc_present_in_locale('installer', 4) . '/content/choosePackageGroups.html')); + _g('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/' . doc_present_in_locale('installer', 4) . '/content/choosePackageGroups.html'), 'p'); - _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.'); + _g('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.', null, 'p'); - _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.'); + _g('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.', null, 'p'); ?>

@@ -75,24 +75,24 @@ _lang_load($locale, '4');

Mageia.org nonprofit organisation, which is governed by a body of recognized and elected contributors.',array('../about/')); + _g('Mageia 4 is supported by the Mageia.org nonprofit organisation, which is governed by a body of recognized and elected contributors.',array('../about/'), 'p'); - _h('Mageia 4 has been made by more than 100 people from all around the world.',array('//people.mageia.org/g/')); + _g('Mageia 4 has been made by more than 100 people from all around the world.',array('//people.mageia.org/g/'), 'p'); - _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.'); + _g('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.', null, 'p'); - _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')); + _g('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'), 'p'); ?>

diff --git a/en/4/nav.php b/en/4/nav.php index 8ea54b83e..c7230c9c3 100644 --- a/en/4/nav.php +++ b/en/4/nav.php @@ -1,13 +1,13 @@ _t('Mageia 4'), - "/{$locale}/downloads/" => _t('Download'), - $releasenotes => _t('Release notes'), - $errata => _t('Errata'), + "/{$locale}/4/" => _r('Mageia 4'), + "/{$locale}/downloads/" => _r('Download'), + $releasenotes => _r('Release notes'), + $errata => _r('Errata'), ); $sru = trim($_SERVER['REQUEST_URI']); -- cgit v1.2.1