aboutsummaryrefslogtreecommitdiffstats
path: root/en/5
diff options
context:
space:
mode:
authorManuel Hiebel <leuhmanu@mageia.org>2014-03-22 16:08:55 +0000
committerManuel Hiebel <leuhmanu@mageia.org>2014-03-22 16:08:55 +0000
commit543659dc6043ae8bb208d2b5a1bf8ccfefe8d2b8 (patch)
tree45f97e8d60eb124e793f3f349eb41819127655cc /en/5
parente7a58f35622a2f92a5c13db484ce6ca377ee8051 (diff)
downloadwww-543659dc6043ae8bb208d2b5a1bf8ccfefe8d2b8.tar
www-543659dc6043ae8bb208d2b5a1bf8ccfefe8d2b8.tar.gz
www-543659dc6043ae8bb208d2b5a1bf8ccfefe8d2b8.tar.bz2
www-543659dc6043ae8bb208d2b5a1bf8ccfefe8d2b8.tar.xz
www-543659dc6043ae8bb208d2b5a1bf8ccfefe8d2b8.zip
MGA5 lang file (gettext)
Diffstat (limited to 'en/5')
-rwxr-xr-xen/5/download_index.php147
-rw-r--r--en/5/index.php2
-rw-r--r--en/5/nav.php16
3 files changed, 95 insertions, 70 deletions
diff --git a/en/5/download_index.php b/en/5/download_index.php
index 5f29487d9..2c98329c4 100755
--- a/en/5/download_index.php
+++ b/en/5/download_index.php
@@ -1,13 +1,13 @@
<?php
$name = 'Mageia';
-$version = '4';
-$release = 'RC';
+$version = '5';
+$release = 'alpha1';
define('HLANG', true);
require '../../langs.php';
-_lang_load($locale, $version);
+$dictionary = read_translation_file($locale, cauldron);
require '../downloads/get/lib.php';
function get_mageia_image_file_name($name, $version, $release, $variant = null, $arch, $medium, $ext)
@@ -22,20 +22,20 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
{
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 _t('forthcoming');
+echo _r('forthcoming');
/*echo $torrent && $unavailabletorrent ? sprintf(_t('forthcoming')) : sprintf('<a rel="nofollow" href="../downloads/get/?q=%s%s" title="%s">%s</a>',
get_mageia_image_file_name($name, $version, $release, $variant, $arch, $medium, '.iso'),
@@ -51,9 +51,9 @@ echo _t('forthcoming');
<html dir="ltr" lang="<?php echo $locale; ?>">
<head>
<meta charset="utf-8">
- <title><?php echo sprintf(_t('Download') . ' %s %s %s',$name, $version, $release)?></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(_g('Download').' '. '%s %s %s', $name, $version, $release)?></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.'/'.$verion;?>/">
<link rel="stylesheet" href="/g/style/all.css">
@@ -70,31 +70,31 @@ echo _t('forthcoming');
</head>
<body class="release downloads">
<?php echo $hsnav; ?>
- <h1 id="mgnavt"><?php echo sprintf(_t('Download') . '<strong>%s %s %s</strong>',$name, $version, $release)?></h1>
+ <h1 id="mgnavt"><?php echo sprintf(_g('Download') . ' <strong>%s %s %s</strong>',$name, $version, $release)?></h1>
<?php include '../'.$version.'/nav.php'; ?>
- <p class="unstable-release-warning"><?php _e('Be careful! This is a alpha, unstable release.');
-//_e('Be careful! This is a beta, unstable release.');
- //_e('It is only intended for developer use. <strong>DO NOT USE THIS IN PRODUCTION OR FOR OFFICIAL REVIEW.</strong>');?>
-<?php //_e('This is a Release Candidate. Release Candidate software is software that has graduated Beta testing, and should be a release-ready product suitable for advanced users and reviewers. However, beginning users and critical-applications users may wish to wait for the final release planned for February 2014.'); _e('Release Candidate is intended to identify any remaining bugs or missing packages.'); ?></p>
+ <p class="unstable-release-warning"><?php _g('Be careful! This is a alpha, unstable release.');
+//_g('Be careful! This is a beta, unstable release.');
+//_g('It is only intended for developer use. <strong>DO NOT USE THIS IN PRODUCTION OR FOR OFFICIAL REVIEW.</strong>');
+//_g('This is a Release Candidate. Release Candidate software is software that has graduated Beta testing, and should be a release-ready product suitable for advanced users and reviewers. However, beginning users and critical-applications users may wish to wait for the final release planned for December 2014.'); _g('Release Candidate is intended to identify any remaining bugs or missing packages.'); ?></p>
<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" 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.9GB</td>
<td>
<?php dl_link($name,$version,$release,null,'i586','DVD',false);
@@ -108,7 +108,7 @@ echo _t('forthcoming');
</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($name,$version,$release,null,'dual','DVD',false);?>
@@ -119,41 +119,41 @@ echo _t('forthcoming');
</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:'); ?>
+ <?php _g('Up to 167 locales are supported:'); ?>
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!'); ?>
+ <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.');
+ _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 from the
+ <h2><?php _g('LiveCDs and LiveDVDs');?></h2>
+ <p class="dlinfo"><?php _g('Use LiveCDs and LiveDVDs for fresh new installs ONLY.');?>
+ <span class="warn"><?php _g('DO NOT use these LiveCDs or LiveDVDs to upgrade from from the
prior Mageia release!'); ?></span>
- <?php /*_e('Use above DVD or CD and see <a href="%s" hreflang="en">upgrade guide</a>.', array('https://wiki.mageia.org/en/Mageia_4_Release_Notes#Upgrading_from_Mageia_3'));*/?></p>
+ <?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($name,$version,$release,'LiveDVD-KDE4','i586','DVD',false);
@@ -167,7 +167,7 @@ prior Mageia release!'); ?></span>
</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($name,$version,$release,'LiveDVD-GNOME','i586','DVD',false);
@@ -180,7 +180,7 @@ prior Mageia release!'); ?></span>
</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($name,$version,$release,'LiveCD-KDE4-en','i586','CD',false);
@@ -190,7 +190,7 @@ prior Mageia release!'); ?></span>
</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($name,$version,$release,'LiveCD-GNOME-en','i586','CD',false);
@@ -204,31 +204,31 @@ prior Mageia release!'); ?></span>
</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.')?>
- <span class="warn"><?php _e('These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it is the case, use above one.'); ?></span></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.')?>
+ <span class="warn"><?php _g('These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it is the case, use above one.'); ?></span></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>
- <td class="size">~27MB</td>
+ <th><?php _g('Network installer, Free Software CD')?></th>
+ <td class="size">27MB<br>53MB</td>
<td><?php dl_link($name,$version,$release,'Boot','i586','CD',false);
echo '<br>';
dl_link($name,$version,$release,'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>
- <td class="size">~36MB</td>
+ <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($name,$version,$release,'Boot-nonfree','i586','CD',false);
echo '<br>';
dl_link($name,$version,$release,'Boot-nonfree','x86_64','CD',false);?>
@@ -243,22 +243,41 @@ prior Mageia release!'); ?></span>
<div class="yui-u">
<div class="para" style="padding-left: 1em;">
<ul class="hl">
- <li><?php _e('<a href="%s%s_%s_%s">Release notes</a>', array('https://wiki.mageia.org/en/',$name,$version,$release))?></li>
- <li><?php _e('<a href="%s">Errata</a>', array('https://wiki.mageia.org/en/Mageia_4_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>
<li><?php _e('Help us on'); echo'<a href="../contribute">',"$name $version";?></a></li>
-
</ul>
- <br>
- <br>
- <?php
- _h('Looking for a stable release?', null, 'h3');
+ <?php /*
+ echo '<br><br>';
+ _g('Looking for a stable release?', null, 'h3');
echo '<p>';
- _e('It is <a href="%s">here</a>.', array('../downloads/'));
+ _g('It is <a href="%s">here</a>.', array('../downloads/'));
echo '</p>';
- ?>
+
+
+
+ _g('Upgrading<br>from %s ?', array('Mageia 4'), 'h3')?>
+ <ul class="hl"><?php
+ _g('<strong>do not</strong> use LiveCDs;', null, 'li');
+ _g('see the <a href="%s" hreflang="en">upgrade guide</a>', array($upgradeguide), 'li');
+ echo '</ul><br><br>';
+
+
+
+ _g('Looking for %s ?', array('Mageia 4'), 'h3');
+ echo '<p>';
+ _g('It is <a href="%s">here</a>.', array('../4/'),' ');
+ echo '<span class="warn">', _g('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>';
+ echo '</p>';
+
+
+
+ _g('Need more challenge?', null, 'h3');
+ _g('You can <a href="%s">help</a> us <a href="%s">on %s</a>.', array('../contribute/','../contribute/','Mageia 6'));
+ */ ?>
</div>
<hr>
</div>
diff --git a/en/5/index.php b/en/5/index.php
index d2f8c161a..d597cf184 100644
--- a/en/5/index.php
+++ b/en/5/index.php
@@ -1 +1 @@
-<?php include '../4/download_index.php';
+<?php include '../5/download_index.php';
diff --git a/en/5/nav.php b/en/5/nav.php
index 42d0bef81..9448381a8 100644
--- a/en/5/nav.php
+++ b/en/5/nav.php
@@ -1,11 +1,17 @@
<?php
+$releasenotes = "https://wiki.mageia.org/en/Mageia_5_$release"; //_r('https://wiki.mageia.org/en/Mageia_5_Release_Notes');
+$errata = _r('https://wiki.mageia.org/en/Mageia_5_Errata');
+$upgradeguide = _r('https://wiki.mageia.org/en/Mageia_5_Release_Notes#Upgrading_from_Mageia_4');
+
$nav = array(
- "https://wiki.mageia.org/en/Mageia_4_Development#Development_Planning" => _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'),
+ "https://wiki.mageia.org/en/Mageia_5_Development#Development_Planning" => _r('Development roadmap'),
+ "https://wiki.mageia.org/en/FeatureMageia5_Review" => _r('Features review'),
+ /*"/{$locale}/5/" => 'Mageia&nbsp;5',
+ "/{$locale}/downloads/" => _r('Download'),*/
+ $releasenotes => _r('Release notes'),
+ $errata => _r('Errata'),
+ "//bugs.mageia.org/" => _r('Bugs Reports'),
);
$sru = trim($_SERVER['REQUEST_URI']);