diff options
Diffstat (limited to 'en/2')
| -rw-r--r-- | en/2/download_index.php | 90 | ||||
| -rw-r--r-- | en/2/for-pc/index.php | 56 | ||||
| -rw-r--r-- | en/2/for-server/index.php | 40 | ||||
| -rw-r--r-- | en/2/index.php | 34 | ||||
| -rw-r--r-- | en/2/nav.php | 8 |
5 files changed, 114 insertions, 114 deletions
diff --git a/en/2/download_index.php b/en/2/download_index.php index 6d63689b0..25524306c 100644 --- a/en/2/download_index.php +++ b/en/2/download_index.php @@ -3,7 +3,7 @@ define('HLANG', true); require '../../langs.php'; -_lang_load($locale, '2'); +$dictionary = read_translation_file($locale, '2'); require '../downloads/get/lib.php'; ?> @@ -11,9 +11,9 @@ require '../downloads/get/lib.php'; <html dir="ltr" lang="<?php echo $locale; ?>"> <head> <meta charset="utf-8"> - <title><?php _e('Download Mageia 2')?></title> - <meta name="description" content="<?php _e('Download Mageia 2 DVD, CD, LiveCD, network install ISO images.') ?>"> - <meta name="keywords" content="<?php _e('mageia, mageia 2, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent')?>"> + <title><?php _g('Download Mageia 2')?></title> + <meta name="description" content="<?php _g('Download Mageia 2 DVD, CD, LiveCD, network install ISO images.') ?>"> + <meta name="keywords" content="<?php _g('mageia, mageia 2, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent')?>"> <meta name="robots" content="index,nofollow,nosnippet"> <link rel="canonical" href="/<?php echo $locale; ?>/2/"> <link rel="stylesheet" href="/g/style/all.css"> @@ -21,20 +21,20 @@ require '../downloads/get/lib.php'; </head> <body class="release downloads"> <?php echo $hsnav; ?> - <h1 id="mgnavt"><?php _e('Download <strong>Mageia 2</strong>')?></h1> + <h1 id="mgnavt"><?php _g('Download <strong>Mageia 2</strong>')?></h1> <?php include '../2/nav.php'; ?> <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"><h2 class="warn"><?php _e('But please remember that it already <a href="https://blog.mageia.org/en/2013/11/21/farewell-mageia-2/">reached EOL</a>.')?></h2> - <h2><?php _e('Free Software Installation Flavours')?></h2> + <div class="para"><h2 class="warn"><?php _g('But please remember that it already <a href="https://blog.mageia.org/en/2013/11/21/farewell-mageia-2/">reached EOL</a>.')?></h2> + <h2><?php _g('Free Software Installation Flavours')?></h2> <table class="fr-table dlt2"> <thead> <tr> <th>Format</th> - <th class="size"><?php _e('size');?></th> - <th><?php _e('link');?></th> + <th class="size"><?php _g('size');?></th> + <th><?php _g('link');?></th> <th>BitTorrent</th> </tr> </thead> @@ -62,30 +62,30 @@ require '../downloads/get/lib.php'; <p class="dlinfo">Notes:</p> <ul class="dlinfo hl"> - <li><?php _e('Up to 167 locales are supported:'); ?> + <li><?php _g('Up to 167 locales are supported:', null, ' '); ?> 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> + <?php _g('and so much more!', null, ' '); ?> + <a href="https://wiki.mageia.org/en/Available_locales" hreflang="en"><?php _g('See the comprehensive list')?></a>.</li> <li><?php - _e('These DVD and CD ISOs are made of Free Software exclusively.'); - _e('As a consequence, <span class="warn">proprietary Wi-Fi and video drivers are not included.'); - _e('If you need WiFi or specific video drivers <em>at install time</em>, you should go with below LiveCDs instead.</span>'); - _e('You may, if you will, add nonfree software repository <em>after</em> the installation.'); + _g('These DVD and CD ISOs are made of Free Software exclusively.', null, ' '); + _g('As a consequence, <span class="warn">proprietary Wi-Fi and video drivers are not included.', null, ' '); + _g('If you need WiFi or specific video drivers <em>at install time</em>, you should go with below LiveCDs instead.</span>', null, ' '); + _g('You may, if you will, add nonfree software repository <em>after</em> the installation.'); ?></li> <li><?php - _e('Please note that there is a <span class="warn">problem with notebooks using Intel, AMD/ATI and nVidia graphic cards.</span>'); - echo sprintf('<a href="https://wiki.mageia.org/en/Mageia_2_Errata#Hardware_Issues">%s</a>', - _t('See the errata about this')); + _g('Please note that there is a <span class="warn">problem with notebooks using Intel, AMD/ATI and nVidia graphic cards.</span>'); + echo sprintf(' <a href="https://wiki.mageia.org/en/Mageia_2_Errata#Hardware_Issues">%s</a>', + _r('See the errata about this')); ?></li> </ul> </div> <div class="para"> <h2>LiveCDs</h2> - <p class="dlinfo"><?php _e('Use LiveCDs for fresh new installs ONLY.');?> - <span class="warn"><?php _e('DO NOT use those LiveCDs to upgrade from Mageia 1!'); ?></span> - <?php _e('Use above DVD or CD and see the <a href="%s" hreflang="en">upgrade guide</a>.', + <p class="dlinfo"><?php _g('Use LiveCDs for fresh new installs ONLY.', null, ' ');?> + <span class="warn"><?php _g('DO NOT use those LiveCDs to upgrade from Mageia 1!', null, ' '); ?></span> + <?php _g('Use above DVD or CD and see the <a href="%s" hreflang="en">upgrade guide</a>.', array('https://wiki.mageia.org/en/Mageia_2_Release_Notes#Upgrading_from_Mageia_1'));?></p> <table class="dlt2"> <thead><tr><th></th><th style="color: black;">GNOME</th><th style="color: black;">KDE</th></tr></thead> @@ -102,7 +102,7 @@ require '../downloads/get/lib.php'; <a rel="nofollow" href="../downloads/get/?q=Mageia-2-LiveCD-KDE4-Europe1-Americas-x86_64-CD.iso&torrent=1">torrent</a></td> </tr> <tr> - <td colspan="3"><p class="dlinfo"><?php _e('Included locales:'); + <td colspan="3"><p class="dlinfo"><?php _g('Included locales:', null, ' '); $product = get_info_for_product('Mageia-2-LiveCD-GNOME-Europe1-Americas-i586-CD.iso'); echo $product['langs']; ?></p></td> @@ -119,7 +119,7 @@ require '../downloads/get/lib.php'; <a rel="nofollow" href="../downloads/get/?q=Mageia-2-LiveCD-KDE4-Europe2-x86_64-CD.iso&torrent=1">torrent</a></td> </tr> <tr> - <td colspan="3"><p class="dlinfo"><?php _e('Included locales:'); + <td colspan="3"><p class="dlinfo"><?php _g('Included locales:', null, ' '); $p = get_info_for_product('Mageia-2-LiveCD-GNOME-Europe2-i586-CD.iso'); echo $p['langs']; ?></p></td> @@ -136,7 +136,7 @@ require '../downloads/get/lib.php'; <a rel="nofollow" href="../downloads/get/?q=Mageia-2-LiveCD-KDE4-Africa-India-x86_64-CD.iso&torrent=1">torrent</a></td> </tr> <tr> - <td colspan="3"><p class="dlinfo"><?php _e('Included locales:'); + <td colspan="3"><p class="dlinfo"><?php _g('Included locales:', null, ' '); $p = get_info_for_product('Mageia-2-LiveCD-GNOME-Africa-India-i586-CD.iso'); echo $p['langs']; ?></p></td> @@ -153,36 +153,36 @@ require '../downloads/get/lib.php'; <a rel="nofollow" href="../downloads/get/?q=Mageia-2-LiveCD-KDE4-Asia-no-India-x86_64-CD.iso&torrent=1">torrent</a></td> </tr> <tr> - <td colspan="3"><p class="dlinfo"><?php _e('Included locales:'); + <td colspan="3"><p class="dlinfo"><?php _g('Included locales:', null, ' '); $p = get_info_for_product('Mageia-2-LiveCD-GNOME-Asia-no-India-i586-CD.iso'); echo $p['langs']; ?></p></td> </tr> </tbody> </table> - <p class="dlinfo"><?php _e('Each download is approximately 700MB.');?></p> + <p class="dlinfo"><?php _g('Each download is approximately 700MB.');?></p> </div> <div class="para"> - <h2><?php _e('Wired Network-based Installation CD')?></h2> - <p class="dlinfo"><?php _e('Download quickly (about 40 MB) and immediately boot into install mode from <em>wired</em> network or a local disk.')?></p> + <h2><?php _g('Wired Network-based Installation CD')?></h2> + <p class="dlinfo"><?php _g('Download quickly (about 40 MB) and immediately boot into install mode from <em>wired</em> network or a local disk.')?></p> <table class="fr-table dlt2"> <thead> <tr> <th>Format</th> - <th colspan="2"><?php _e('link');?></th> + <th colspan="2"><?php _g('link');?></th> </tr> </thead> <tbody> <tr> - <th><?php _e('Pure Free Software CD')?></th> + <th><?php _g('Pure Free Software CD')?></th> <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-Boot-i586-CD.iso">32bit</a></td> <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-Boot-x86_64-CD.iso">64bit</a></td> </tr> <tr> - <th><?php _e('Same + nonfree firmware')?><br> - <span class="dlinfo"><?php _e('needed for some disc controllers, some network cards, etc.')?></span></th> + <th><?php _g('Same + nonfree firmware')?><br> + <span class="dlinfo"><?php _g('needed for some disc controllers, some network cards, etc.')?></span></th> <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-Boot-nonfree-i586-CD.iso">32bit</a></td> <td><a rel="nofollow" href="../downloads/get/?q=Mageia-2-Boot-nonfree-x86_64-CD.iso">64bit</a></td> </tr> @@ -195,30 +195,30 @@ require '../downloads/get/lib.php'; <div class="yui-u"> <div class="para" style="padding-left: 1em;"> <h2>Mageia 2</h2> - <?php _h('May 22<sup>nd</sup> 2012')?> + <?php _g('May 22<sup>nd</sup> 2012', null, 'p')?> <ul class="hl"> - <li><a href="https://wiki.mageia.org/en/Mageia_2_Release_Notes"><?php _e('Release notes')?></a></li> - <li><a href="https://wiki.mageia.org/en/Mageia_2_Errata"><?php _e('Errata')?></a>.</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><a href="https://wiki.mageia.org/en/Mageia_2_Release_Notes"><?php _g('Release notes')?></a></li> + <li><a href="https://wiki.mageia.org/en/Mageia_2_Errata"><?php _g('Errata')?></a>.</li> + <li><?php _g('<a href="%s">Which to choose</a>', array('https://wiki.mageia.org/en/Installation_Media'))?></li> + <li><?php _g('<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 _g('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 1?', null, 'h3')?> + <?php _g('Upgrading<br>from Mageia 1?', 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>', + _g('<strong>do not</strong> use LiveCDs;', null, 'li'); + _g('see the <a href="%s" hreflang="en">upgrade guide</a>', array('https://wiki.mageia.org/en/Mageia_2_Release_Notes#Upgrading_from_Mageia_1'), 'li'); ?></ul> <br> <br> <?php - _h('Looking for Mageia 1?', null, 'h3'); + _g('Looking for Mageia 1?', null, 'h3'); echo '<p>'; - _e('It is <a href="%s">here now</a>.', array('../downloads/1/')); - _e('But please remember that it already <a href="https://blog.mageia.org/en/2012/12/02/mageia-1-eol/">reached EOL</a>.', null, ''); + _g('It is <a href="%s">here now</a>.', array('../downloads/1/'), ' '); + _g('But please remember that it already <a href="https://blog.mageia.org/en/2012/12/02/mageia-1-eol/">reached EOL</a>.'); echo '</p>'; ?> </div> diff --git a/en/2/for-pc/index.php b/en/2/for-pc/index.php index f220b354e..07d452a49 100644 --- a/en/2/for-pc/index.php +++ b/en/2/for-pc/index.php @@ -2,14 +2,14 @@ define('HLANG', true); require '../../../langs.php'; -_lang_load($locale, '2'); +$dictionary = read_translation_file($locale, '2'); ?> <!DOCTYPE html> <html lang="<?php echo $locale; ?>"> <head> <meta charset="utf-8"> - <title><?php _e('Mageia 2, for your PC')?></title> + <title><?php _g('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; } @@ -19,17 +19,17 @@ _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> + <h1 id="mgnavtitle"><a href="../2/">Mageia 2</a> » <?php _g('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:'); + _g('Plenty', null, 'h2'); + _g('There are 19 881 packages in our repositories. And that\'s just for the 64-bit branch.', null, 'p'); + _g('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.', null, 'p'); + _g('Here\'s a cross-section, first of the working graphical environments, and then of the core applications you could be using on your desktop:', null, 'p'); + _g('Environments', null, 'h2'); + _g('Mageia 2 has all the major desktop environments:', null, 'p'); ?> <ul> <li>KDE4 SC 4.8.2,</li> @@ -40,58 +40,58 @@ _lang_load($locale, '2'); <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.'); + _g('And then there are the window managers, including Openbox, WindowMaker, IceWM, Fluxbox, Fvwm2 and Awesome.', null, 'p'); + _g('Applications →', null, 'h2'); + _g('There are many, many to choose from – including all the most popular.', null, 'p'); ?> </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.'); + _g('Web', null, 'h3'); + _g('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.', null, 'p'); ?> </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.'); + _g('Messaging', null, 'h3'); + _g('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.', null, 'p'); ?> </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.'); + _g('Office', null, 'h3'); + _g('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.', null, 'p'); ?> </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.'); + _g('Image', null, 'h3'); + _g('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.', null, 'p'); ?> </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.'); + _g('Sound', null, 'h3'); + _g('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.', null, 'p'); ?> </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.'); + _g('Video', null, 'h3'); + _g('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.', null, 'p'); ?> </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.'); + _g('Plus', null, 'h3'); + _g('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.', null, 'p'); ?> </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/')); + _g('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'), 'p'); + _g('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/'), 'p'); ?> </div> </body> diff --git a/en/2/for-server/index.php b/en/2/for-server/index.php index 736947f40..d5d6f27e3 100644 --- a/en/2/for-server/index.php +++ b/en/2/for-server/index.php @@ -2,14 +2,14 @@ define('HLANG', true); require '../../../langs.php'; -_lang_load($locale, '2'); +$dictionary = read_translation_file($locale, '2'); ?> <!DOCTYPE html> <html lang="<?php echo $locale; ?>"> <head> <meta charset="utf-8"> - <title><?php _e('Mageia 2, for your server')?></title> + <title><?php _g('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; } @@ -19,37 +19,37 @@ _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> + <h1 id="mgnavtitle"><a href="../2/">Mageia 2</a> » <?php _g('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')); + _g('Mageia 2 has all the main services and server packages you will need to run your server.', null, 'p'); + _g('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'), 'p'); - _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('https://svnweb.mageia.org/adm/puppet/')); + _g('Administration', null, 'h3'); + _g('For centralised administration, we include puppet 2.7.11; we use it widely in <a href="%s">our own infrastructure</a>.', + array('https://svnweb.mageia.org/adm/puppet/'), 'p'); - _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.'); + _g('The entire High Availability stack has been updated, and now includes drbd 8.3.11, Corosync 2.0.0 and Pacemaker 1.1.7.', null, 'p'); - _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.'); + _g('Databases', null, 'h3'); + _g('Databases included are PostgreSQL 8.4.11; MariaDB, which replaces MySQL 5.5.23; BDB.', null, 'p'); + _g('And there are NoSQL servers too: CouchDB 1.1.1, Redis 2.4.8, Cassandra 1.4.0, MongoDB 2.0.3.', null, 'p'); - _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.'); + _g('Servers', null, 'h3'); + _g('Web servers include Apache 2.2.22, Cherokee 1.2.101 and lighttpd 1.4.30.', null, 'p'); + _g('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.', null, 'p'); + _g('Mail servers included with Mageia 2 are Postfix 2.8.8, Cyrus-imapd 2.4.13 and Dovecot 1.2.17.', null, 'p'); ?> </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/')); + _g('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>.', null, 'p'); + _g('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/'), 'p'); ?> </div> </body> diff --git a/en/2/index.php b/en/2/index.php index 32d03a20a..2fd8055b5 100644 --- a/en/2/index.php +++ b/en/2/index.php @@ -3,15 +3,15 @@ define('HLANG', true); require '../../langs.php'; -_lang_load($locale, '2'); +$dictionary = read_translation_file($locale, '2'); ?> <!DOCTYPE html> <html lang="<?php echo $locale; ?>"> <head> <meta charset="utf-8"> - <title><?php _e('Mageia 2')?></title> + <title><?php _g('Mageia 2')?></title> <link rel="stylesheet" href="/g/style/all.css"> - <meta name="description" content="<?php _e('Mageia 2 is the new, solid, stable Linux distribution from the Mageia project.')?>"> + <meta name="description" content="<?php _g('Mageia 2 is the new, solid, stable Linux distribution from the Mageia project.')?>"> <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; } @@ -26,23 +26,23 @@ _lang_load($locale, '2'); <section> <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')); + _g('Mageia 2 is a GNU/Linux distribution for your computer, released by the <a href="%s">Mageia community</a>.', + array('../community'), 'p'); - _h('What\'s new?', null, 'h2'); - _h('Too much to include here! See the <a href="https://wiki.mageia.org/en/Mageia_2_Release_Notes">release notes</a> for an extensive exposé.'); - echo '<p>' . _t('<a href="../2/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;">Download it right away!</a>'); - echo '<span class="warn">' . _t('But please remember that it already <a href="https://blog.mageia.org/en/2013/11/21/farewell-mageia-2/">reached EOL</a>.') . '</span></p>'; - _h('Mageia in context', null, 'h2'); - _h('Mageia is both a Community and a Linux Distribution, with Mageia 2 being our second release.'); - _h('Since the release of <a href="../1/">Mageia 1</a>, our offering has been consistently in the <a href="%s">top 10 of Distrowatch\'s most popular distributions</a>.', - array('http://distrowatch.com/popularity')); + _g('What\'s new?', null, 'h2'); + _g('Too much to include here! See the <a href="https://wiki.mageia.org/en/Mageia_2_Release_Notes">release notes</a> for an extensive exposé.', null, 'p'); + echo '<p>' . _r('<a href="../2/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;">Download it right away!</a>'); + echo ' <span class="warn">' . _r('But please remember that it already <a href="https://blog.mageia.org/en/2013/11/21/farewell-mageia-2/">reached EOL</a>.') . '</span></p>'; + _g('Mageia in context', null, 'h2'); + _g('Mageia is both a Community and a Linux Distribution, with Mageia 2 being our second release.', null, 'p'); + _g('Since the release of <a href="../1/">Mageia 1</a>, our offering has been consistently in the <a href="%s">top 10 of Distrowatch\'s most popular distributions</a>.', + array('http://distrowatch.com/popularity'), 'p'); - _h('Mageia 2 is supported by the <a href="../about/">Mageia.org nonprofit organisation</a>, which is governed by a body of recognized and elected contributors.'); - _h('Mageia 2 has been made by more than 100 people from all around the world.'); + _g('Mageia 2 is supported by the <a href="../about/">Mageia.org nonprofit organisation</a>, which is governed by a body of recognized and elected contributors.', null, 'p'); + _g('Mageia 2 has been made by more than 100 people from all around the world.', null, 'p'); - _h('Our work adds to the excellent work of the wider Linux and Free Software community. We aim to bring one of the best, most stable, reliable and enjoyable experience and platform 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.'); + _g('Our work adds to the excellent work of the wider Linux and Free Software community. We aim to bring one of the best, most stable, reliable and enjoyable experience and platform we can make; for regular users, developers and businesses.', null, 'p'); + _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.', null, 'p'); ?> </section> </div> diff --git a/en/2/nav.php b/en/2/nav.php index a1d2344cf..891c71957 100644 --- a/en/2/nav.php +++ b/en/2/nav.php @@ -1,10 +1,10 @@ <?php $nav = array( - "/{$locale}/2/" => _t('Mageia 2'), - "/{$locale}/2/download_index.php" => _t('Download'), - "/{$locale}/2/for-pc/" => _t('For PC'), - "/{$locale}/2/for-server/" => _t('For server'), + "/{$locale}/2/" => _r('Mageia 2'), + "/{$locale}/2/download_index.php" => _r('Download'), + "/{$locale}/2/for-pc/" => _r('For PC'), + "/{$locale}/2/for-server/" => _r('For server'), ); $sru = trim($_SERVER['REQUEST_URI']); |