diff options
| author | Filip Komar <filip@mageia.org> | 2014-03-23 12:16:53 +0000 |
|---|---|---|
| committer | Filip Komar <filip@mageia.org> | 2014-03-23 12:16:53 +0000 |
| commit | f930b5666b5822404b944eadcd4a6ac38e55d94e (patch) | |
| tree | b5fd04b07bcdb39ef4d25cc2c5eba833b66b38e0 /en/4 | |
| parent | 9b32c3b8667390705d389845763ae2afdc0cc9ff (diff) | |
| download | www-f930b5666b5822404b944eadcd4a6ac38e55d94e.tar www-f930b5666b5822404b944eadcd4a6ac38e55d94e.tar.gz www-f930b5666b5822404b944eadcd4a6ac38e55d94e.tar.bz2 www-f930b5666b5822404b944eadcd4a6ac38e55d94e.tar.xz www-f930b5666b5822404b944eadcd4a6ac38e55d94e.zip | |
all mga4 pages converted to gettext + some identation cleanup
Diffstat (limited to 'en/4')
| -rwxr-xr-x | en/4/download_index.php | 222 | ||||
| -rw-r--r-- | en/4/index.php | 48 | ||||
| -rw-r--r-- | en/4/nav.php | 14 |
3 files changed, 142 insertions, 142 deletions
diff --git a/en/4/download_index.php b/en/4/download_index.php index 6315cfbfe..3aecce044 100755 --- a/en/4/download_index.php +++ b/en/4/download_index.php @@ -4,13 +4,13 @@ define('HLANG', true); require '../../langs.php'; -_lang_load($locale, '4'); +$dictionary = read_translation_file($locale, '4'); require '../downloads/get/lib.php'; function get_mageia_image_file_name($variant = null, $arch, $medium, $ext) { $va = empty($variant) ? $arch : $variant . '-' . $arch; - + return implode('-', array('Mageia','4', $va, $medium)) . $ext; } @@ -18,20 +18,20 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un { switch ($arch) { case "i586": - $bit = _d('32bit'); + $bit = _r('32bit'); break; case "x86_64": - $bit = _d('64bit'); + $bit = _r('64bit'); break; case "dual": - $bit = _d('dualarch'); + $bit = _r('dualarch'); break; default: $bit = ''; break; } - - echo $torrent && $unavailabletorrent ? sprintf(_t('forthcoming')) : sprintf('<a rel="nofollow" href="../downloads/get/?q=%s%s" title="%s">%s</a>', + + echo $torrent && $unavailabletorrent ? sprintf(_r('forthcoming')) : sprintf('<a rel="nofollow" href="../downloads/get/?q=%s%s" title="%s">%s</a>', get_mageia_image_file_name($variant, $arch, $medium, '.iso'), $torrent ? '&torrent=1' : '', implode(' ', array('Mageia 4', $variant, $arch, $medium)), @@ -45,9 +45,9 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un <html dir="ltr" lang="<?php echo $locale; ?>"> <head> <meta charset="utf-8"> - <title><?php echo sprintf(_t('Download') . 'Mageia 4')?></title> - <meta name="description" content="<?php _e('Download Mageia 4 DVD, CD, LiveCD, network install ISO images.') ?>"> - <meta name="keywords" content="<?php _e('mageia, mageia 4, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent')?>"> + <title><?php echo sprintf(_r('Download') . ' Mageia 4')?></title> + <meta name="description" content="<?php _g('Download Mageia 4 DVD, CD, LiveCD, network install ISO images.') ?>"> + <meta name="keywords" content="<?php _g('mageia, mageia 4, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent')?>"> <meta name="robots" content="index,nofollow,nosnippet"> <link rel="canonical" href="/<?php echo $locale.'/4';?>/"> <link rel="stylesheet" href="/g/style/all.css"> @@ -55,127 +55,127 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un </head> <body class="release downloads"> <?php echo $hsnav; ?> - <h1 id="mgnavt"><?php echo sprintf(_t('Download') . '<strong>Mageia 4</strong>')?></h1> + <h1 id="mgnavt"><?php echo sprintf(_r('Download') . ' <strong>Mageia 4</strong>')?></h1> <?php include '../4/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="yui-u first rb1"> <div class="para" id="classical"> - <h2><?php _e('Classical Installation Flavours')?></h2> + <h2><?php _g('Classical Installation Flavours')?></h2> <table class="fr-table dlt2"> <thead> <tr> - <th><?php _e('Format');?></th> - <th class="size"><?php _e('size');?></th> - <th><?php _e('link');?></th> - <th><?php _e('BitTorrent');?></th> + <th><?php _g('Format');?></th> + <th class="size"><?php _g('size');?></th> + <th><?php _g('link');?></th> + <th><?php _g('BitTorrent');?></th> </tr> </thead> <tbody> <tr> <th class="name" style="width:60%">DVD 32bit<br>DVD 64bit<br> - <span class="dlinfo"><?php _e('Desktop'); ?>: GNOME, KDE, XFCE, Mate, Cinnamon, LXDE, ...</span></th> + <span class="dlinfo"><?php _g('Desktop'); ?>: GNOME, KDE, XFCE, Mate, Cinnamon, LXDE, ...</span></th> <td class="size">3.7GB</td> - <td> - <?php dl_link(null,'i586','DVD',false); - echo '<br>'; - dl_link(null,'x86_64','DVD',false); - echo '</td><td>'; - dl_link(null,'i586','DVD',true); - echo '<br>'; - dl_link(null,'x86_64','DVD',true);?> - </td> - </tr> + <td> + <?php dl_link(null,'i586','DVD',false); + echo '<br>'; + dl_link(null,'x86_64','DVD',false); + echo '</td><td>'; + dl_link(null,'i586','DVD',true); + echo '<br>'; + dl_link(null,'x86_64','DVD',true);?> + </td> + </tr> <tr> <th class="name">DVD dualarch<br> - <span class="dlinfo"><?php _e('Desktop'); ?>: XFCE</span></th> + <span class="dlinfo"><?php _g('Desktop'); ?>: XFCE</span></th> <td class="size">1GB</td> - <td> - <?php dl_link(null,'dual','DVD',false);?> - </td><td> - <?php dl_link(null,'dual','DVD',true);?> - </td> + <td> + <?php dl_link(null,'dual','DVD',false);?> + </td><td> + <?php dl_link(null,'dual','DVD',true);?> + </td> </tr> </tbody> </table> - <p class="dlinfo"><?php _e('Notes:'); ?></p> + <p class="dlinfo"><?php _g('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 contains Free Software and some proprietary drivers.'); - _e('You will be asked of which kind of Software you want to install.'); + _g('These DVD and CD ISOs contains Free Software and some proprietary drivers.', null, ' '); + _g('You will be asked of which kind of Software you want to install.'); ?></li> - <li><?php _e('The dualarch DVD contains only a minimal list of packages.')?></li> + <li><?php _g('The dualarch DVD contains only a minimal list of packages.')?></li> </ul> </div> <div class="para" id="live"> - <h2><?php _e('LiveCDs and LiveDVDs');?></h2> - <p class="dlinfo"><?php _e('Use LiveCDs and LiveDVDs for fresh new installs ONLY.');?> - <span class="warn"><?php _e('DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 3!'); ?></span> - <?php _e('Use above DVD or CD and see <a href="%s" hreflang="en">upgrade guide</a>.', array($upgradeguide));?></p> + <h2><?php _g('LiveCDs and LiveDVDs');?></h2> + <p class="dlinfo"><?php _g('Use LiveCDs and LiveDVDs for fresh new installs ONLY.', null, ' ');?> + <span class="warn"><?php _g('DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 3!', null, ' '); ?></span> + <?php _g('Use above DVD or CD and see <a href="%s" hreflang="en">upgrade guide</a>.', array($upgradeguide));?></p> <table class="fr-table dlt2"> <thead> <tr> - <th><?php _e('Desktop');?></th> - <th class="size"><?php _e('size');?></th> - <th><?php _e('link');?></th> - <th><?php _e('BitTorrent');?></th> + <th><?php _g('Desktop');?></th> + <th class="size"><?php _g('size');?></th> + <th><?php _g('link');?></th> + <th><?php _g('BitTorrent');?></th> </tr> </thead> <tbody> <tr> <th class="name" style="width:60%">LiveDVD KDE<br> - <span class="dlinfo"><?php _e('All languages')?></span></th> + <span class="dlinfo"><?php _g('All languages')?></span></th> <td class="size">1.4GB</td> - <td> - <?php dl_link('LiveDVD-KDE4','i586','DVD',false); - echo '<br>'; - dl_link('LiveDVD-KDE4','x86_64','DVD',false); - echo '</td><td>'; - dl_link('LiveDVD-KDE4','i586','DVD',true); - echo '<br>'; - dl_link('LiveDVD-KDE4','x86_64','DVD',true);?> - </td> + <td> + <?php dl_link('LiveDVD-KDE4','i586','DVD',false); + echo '<br>'; + dl_link('LiveDVD-KDE4','x86_64','DVD',false); + echo '</td><td>'; + dl_link('LiveDVD-KDE4','i586','DVD',true); + echo '<br>'; + dl_link('LiveDVD-KDE4','x86_64','DVD',true);?> + </td> </tr> <tr> <th class="name">LiveDVD GNOME<br> - <span class="dlinfo"><?php _e('All languages')?></span></th> + <span class="dlinfo"><?php _g('All languages')?></span></th> <td class="size">1.4GB</td> - <td> - <?php dl_link('LiveDVD-GNOME','i586','DVD',false); - echo '<br>'; - dl_link('LiveDVD-GNOME','x86_64','DVD',false); - echo '</td><td>'; - dl_link('LiveDVD-GNOME','i586','DVD',true); - echo '<br>'; - dl_link('LiveDVD-GNOME','x86_64','DVD',true);?> - </td> + <td> + <?php dl_link('LiveDVD-GNOME','i586','DVD',false); + echo '<br>'; + dl_link('LiveDVD-GNOME','x86_64','DVD',false); + echo '</td><td>'; + dl_link('LiveDVD-GNOME','i586','DVD',true); + echo '<br>'; + dl_link('LiveDVD-GNOME','x86_64','DVD',true);?> + </td> <tr> <th class="name">LiveCD KDE<br> - <span class="dlinfo"><?php _e('English only')?></span></th> + <span class="dlinfo"><?php _g('English only')?></span></th> <td class="size">700MB</td> - <td> - <?php dl_link('LiveCD-KDE4-en','i586','CD',false); - echo '</td><td>'; - dl_link('LiveCD-KDE4-en','i586','CD',true);?> - </td> + <td> + <?php dl_link('LiveCD-KDE4-en','i586','CD',false); + echo '</td><td>'; + dl_link('LiveCD-KDE4-en','i586','CD',true);?> + </td> </tr> <tr> <th class="name">LiveCD GNOME<br> - <span class="dlinfo"><?php _e('English only')?></span></th> + <span class="dlinfo"><?php _g('English only')?></span></th> <td class="size">700MB</td> - <td> - <?php dl_link('LiveCD-GNOME-en','i586','CD',false); - echo '</td><td>'; - dl_link('LiveCD-GNOME-en','i586','CD',true);?> + <td> + <?php dl_link('LiveCD-GNOME-en','i586','CD',false); + echo '</td><td>'; + dl_link('LiveCD-GNOME-en','i586','CD',true);?> </tr> </tbody> @@ -184,34 +184,34 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un </div> <div class="para"> - <h2><?php _e('Wired Network-based Installation CD')?></h2> - <p class="dlinfo"><?php _e('Download quickly 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 and immediately boot into install mode from <em>wired</em> network or a local disk.')?></p> <table class="fr-table dlt2"> <thead> <tr> - <th><?php _e('Format');?></th> - <th class="size"><?php _e('size');?></th> - <th><?php _e('link');?></th> + <th><?php _g('Format');?></th> + <th class="size"><?php _g('size');?></th> + <th><?php _g('link');?></th> </tr> </thead> <tbody> <tr> - <th><?php _e('Network installer, Free Software CD')?></th> + <th><?php _g('Network installer, Free Software CD')?></th> <td class="size">27MB<br>53MB</td> - <td><?php dl_link('Boot','i586','CD',false); - echo '<br>'; - dl_link('Boot','x86_64','CD',false);?> - </td> + <td><?php dl_link('Boot','i586','CD',false); + echo '<br>'; + dl_link('Boot','x86_64','CD',false);?> + </td> </tr> <tr> - <th><?php _e('Network installer + nonfree firmware CD')?><br> - <span class="dlinfo"><?php _e('needed for some disc controllers, some network cards, etc.')?></span></th> + <th><?php _g('Network installer + nonfree firmware CD')?><br> + <span class="dlinfo"><?php _g('needed for some disc controllers, some network cards, etc.')?></span></th> <td class="size">37MB<br>74MB</td> - <td><?php dl_link('Boot-nonfree','i586','CD',false); - echo '<br>'; - dl_link('Boot-nonfree','x86_64','CD',false);?> - </td> + <td><?php dl_link('Boot-nonfree','i586','CD',false); + echo '<br>'; + dl_link('Boot-nonfree','x86_64','CD',false);?> + </td> </tr> </tbody> </table> @@ -220,34 +220,34 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un <div class="yui-u"> <div class="para" style="padding-left: 1em;"> <h2>Mageia 4</h2> - <?php _h('February 1<sup>st</sup> 2014')?> + <?php _g('February 1<sup>st</sup> 2014', null, 'p')?> <ul class="hl"> - <li><?php _e('<a href="%s">Release notes</a>', array($releasenotes))?></li> - <li><?php _e('<a href="%s">Errata</a>', array($errata))?></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><?php _g('<a href="%s">Release notes</a>', array($releasenotes))?></li> + <li><?php _g('<a href="%s">Errata</a>', array($errata))?></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 3?', null, 'h3')?> + <?php _g('Upgrading<br>from Mageia 3?', 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>', array($upgradeguide), 'li'); + _g('<strong>do not</strong> use LiveCDs;', null, 'li'); + _g('see the <a href="%s" hreflang="en">upgrade guide</a>', array($upgradeguide), 'li'); ?></ul> <br> <br> <?php - _h('Looking for Mageia 3?', null, 'h3'); + _g('Looking for Mageia 3?', null, 'h3'); echo '<p>'; - _e('It is <a href="%s">here now</a>.', array('../3/')); - /*echo '<span class="warn">', _t('But please remember that it already <a href="%s">reached EOL</a>.',array('https://blog.mageia.org/en/2013/11/21/farewell-mageia-2/')) . '</span>'; */?> + _g('It is <a href="%s">here now</a>.', array('../3/')); + /*_r('But please remember that it already <a href="%s">reached EOL</a>.',array('https://blog.mageia.org/en/2013/11/21/farewell-mageia-2/'), 'span class="warn"'); */?> </p> <br> <br> <?php - _h('Need more challenge?', null, 'h3'); - _h('You can <a href="%s">help</a> us <a href="%s">on Mageia 5</a>.', array('../contribute/','../contribute/')); + _g('Need more challenge?', null, 'h3'); + _g('You can <a href="%s">help</a> us <a href="%s">on Mageia 5</a>.', array('../contribute/','../contribute/'), 'p'); ?> </div> <hr> 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'); ?> <!DOCTYPE html> <html lang="<?php echo $locale; ?>"> <head> <meta charset="utf-8"> - <title><?php _e('Mageia 4')?></title> + <title><?php _g('Mageia 4')?></title> <link rel="stylesheet" href="/g/style/all.css"> - <meta name="description" content="<?php _e('Mageia 4 is the new, solid, stable Linux distribution from the Mageia project.')?>"> + <meta name="description" content="<?php _g('Mageia 4 is the new, solid, stable Linux distribution from the Mageia project.')?>"> <?php include '../../analytics.php'; ?> <style>.para{text-align: justify;text-align: -webkit-auto;}</style> <link rel="stylesheet" href="/g/style/bjqs.css"> @@ -29,33 +29,33 @@ _lang_load($locale, '4'); <div class="yui-u first" style="width:55.5%"> <div class="para"> -<?php _h('About Mageia 4', null, 'h2'); +<?php _g('About Mageia 4', null, 'h2'); - _h('Mageia 4 is a GNU/Linux distribution for your computer, released by the <a href="%s">Mageia community</a>. 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 <a href="%s">Mageia community</a>. It can be installed in several ways, with the Live or Classical ISOs being the most popular methods.', array('../community'), 'p');?> - <p><a href="../downloads/" style="background: #1272B1; color: white; padding: 0.9em; margin: 1em; display: inline-block; text-shadow: 0 1px 6px #000; border-radius: 3px;"><?php _e('Download it right away!');?></a></p> + <p><a href="../downloads/" style="background: #1272B1; color: white; padding: 0.9em; margin: 1em; display: inline-block; text-shadow: 0 1px 6px #000; border-radius: 3px;"><?php _g('Download it right away!');?></a></p> -<?php _h('Live ISO\'s let you try Mageia without installation. Use <a href="%s">these instructions</a> 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.'); +<?php _g('Live ISO\'s let you try Mageia without installation. Use <a href="%s">these instructions</a> 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 <a href="%s">documentation</a> for this installer.', array('../doc/')); + _g('The Classical ISO is the more traditional way to install Mageia directly. Take a look at the complete <a href="%s">documentation</a> 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 <a href="%s">Mageia Application Database</a> 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 <a href="%s">Mageia Application Database</a> 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 <a hreflang="en" href="%s">release notes</a> for an extensive exposé.',array($releasenotes)); + _g('There\'s plenty of new goodness in Mageia 4, too much to include here - see the <a hreflang="en" href="%s">release notes</a> 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 <a href="%s">MageiaWelcome</a>.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 <a href="%s">MageiaWelcome</a>.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 <a href="%s">custom desktop choice</a>.',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 <a href="%s">custom desktop choice</a>.',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'); ?> </div> </div> @@ -75,24 +75,24 @@ _lang_load($locale, '4'); <li><img src="/g/4/mageiawelcome3.png" title="Mageia Welcome 3."></li> <li><img src="/g/4/mageiawelcome4.png" title="Mageia Welcome 4."></li> <li><img src="/g/4/mageiawelcome5.png" title="Mageia Welcome 5."></li> - <li><img src="/g/4/drakconf.png" title="<?php _e('Mageia Control Center');?>"></li> + <li><img src="/g/4/drakconf.png" title="<?php _g('Mageia Control Center');?>"></li> </ul> </div> <div class="para" style="padding: 1em 2em 1em 0em"> <?php - _h('Mageia in context', null, 'h2'); + _g('Mageia in context', null, 'h2'); - _h('Mageia is both a Community and a Linux Distribution, with Mageia 4 being our fourth release.'); + _g('Mageia is both a Community and a Linux Distribution, with Mageia 4 being our fourth release.', null, 'p'); - _h('Mageia 4 is supported by the <a href="%s">Mageia.org nonprofit organisation</a>, which is governed by a body of recognized and elected contributors.',array('../about/')); + _g('Mageia 4 is supported by the <a href="%s">Mageia.org nonprofit organisation</a>, which is governed by a body of recognized and elected contributors.',array('../about/'), 'p'); - _h('Mageia 4 has been made by more than <a href="%s">100 people from all around the world</a>.',array('//people.mageia.org/g/')); + _g('Mageia 4 has been made by more than <a href="%s">100 people from all around the world</a>.',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 <a href="%s">join us</a>.', 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 <a href="%s">join us</a>.', array('../contribute'), 'p'); ?> </div> 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 @@ <?php -$releasenotes = _d('https://wiki.mageia.org/en/Mageia_4_Release_Notes'); -$errata = _d('https://wiki.mageia.org/en/Mageia_4_Errata'); -$upgradeguide = _d('https://wiki.mageia.org/en/Mageia_4_Release_Notes#Upgrading_from_Mageia_3'); +$releasenotes = _r('https://wiki.mageia.org/en/Mageia_4_Release_Notes'); +$errata = _r('https://wiki.mageia.org/en/Mageia_4_Errata'); +$upgradeguide = _r('https://wiki.mageia.org/en/Mageia_4_Release_Notes#Upgrading_from_Mageia_3'); $nav = array( - "/{$locale}/4/" => _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']); |