aboutsummaryrefslogtreecommitdiffstats
path: root/en
diff options
context:
space:
mode:
authorManuel Hiebel <leuhmanu@mageia.org>2015-02-09 23:47:05 +0100
committerManuel Hiebel <leuhmanu@mageia.org>2015-02-09 23:47:05 +0100
commitcc8a3c02ecba94632af1a156ad8ee27cb822ff3c (patch)
tree59af24a4b215a4ecfa5ccae58d8b43f24b343f5b /en
parent261435eb451cafb9663c3e7e49a7e51636495671 (diff)
downloadwww-cc8a3c02ecba94632af1a156ad8ee27cb822ff3c.tar
www-cc8a3c02ecba94632af1a156ad8ee27cb822ff3c.tar.gz
www-cc8a3c02ecba94632af1a156ad8ee27cb822ff3c.tar.bz2
www-cc8a3c02ecba94632af1a156ad8ee27cb822ff3c.tar.xz
www-cc8a3c02ecba94632af1a156ad8ee27cb822ff3c.zip
Add, fix and ajust some strings
Diffstat (limited to 'en')
-rwxr-xr-xen/5/download_index.php18
1 files changed, 10 insertions, 8 deletions
diff --git a/en/5/download_index.php b/en/5/download_index.php
index d7eb09038..756baae22 100755
--- a/en/5/download_index.php
+++ b/en/5/download_index.php
@@ -144,7 +144,7 @@ input[type="radio"], input[type="submit"] {
// _g('Be careful! This is an 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>
+// _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 %s.', array(_r('March 2015'))); _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">
@@ -161,6 +161,8 @@ input[type="radio"], input[type="submit"] {
<br>
<?php _g('All ISOs can also be launched from a <a %s>USB drive</a>.', array('class="iso2usb"'));?>
<span class="warn"><?php _g('Unetbootin is not supported.'); ?></span>
+ <br><br>
+ <?php _g('If you have <a href="%s">UEFI</a>, a procedure is available in the <a href="%s">wiki</a>.', array('http://en.wikipedia.org/wiki/Unified_Extensible_Firmware_Interface','https://wiki.mageia.org/en/Main_Page')) ;?>
</p>
<div id="iso2usbEx">
<?php _g('Dump Mageia ISO on a USB flash drive',null,'h2');
@@ -169,7 +171,7 @@ input[type="radio"], input[type="submit"] {
_g('Unetbootin should not be used to copy the iso image to a USB drive (see below).',null,'p class="warn"');
_g('To dump a Mageia installation ISO on a USB stick, you may try one of several tools:',null,'p');
echo '<ul>';
- _g('IsoDumper, available since Mageia 4 inside repo, for Mageia 3, it\'s <a href="%s">here</a>.',array('http://mirrors.kernel.org/mageia/distrib/3/x86_64/media/core/updates_testing/isodumper-0.25-1.mga3.noarch.rpm'),'li');
+ _g('For Linux, IsoDumper, available inside repo. Or any tools based on dd.',null,'li');
echo '<li>';
_g('For windows use <a href="%s">usbdumper.</a>',array('http://mirrors.kernel.org/mageia/people/marcom/usbdumper.exe'));
_g('If it show "writing error or access denied" try the fallowing method: run the console (cmd), then type "diskpart", then "list disk", then select your disk with "select disk", and type "clean" (it will erase the key).',null,'span class="dlinfo"');?>
@@ -197,7 +199,7 @@ input[type="radio"], input[type="submit"] {
_g('The installer includes the capability of adding the online Mageia repositories during the installation, which means you can install even more packages than those available on the ISO.');?>
</p>
- <?php _g('For 32 and 64bit, size of the ISOs is about 4GB. For the dualarch it\'s about 1GB.',null,'p class="dlinfo"');?>
+ <?php _g('For 32 and 64bit, size of the ISOs is about %sGB. For the dualarch it\'s about %sGB.',array('4','1.6'),'p class="dlinfo"');?>
</div>
<?php } ?>
@@ -207,7 +209,7 @@ input[type="radio"], input[type="submit"] {
<div id="liveEx">
<?php _g('LiveCDs and LiveDVDs',null,'h3');?>
- <?php _g('Live ISO\'s let you try %s without installation. You can run Mageia directly from a CD, DVD or USB device, and try it using one of the graphical user interfaces such as GNOME or KDE.', array("$name $version"), 'p');
+ <?php _g('Live ISO\'s let you try %s without installation. You can run Mageia directly from a CD, DVD or USB device, and try it using one of the graphical user interfaces such as GNOME or KDE.', array("$name $version"), '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');?>
<p><?php _g('Use LiveCDs and LiveDVDs for fresh new installs ONLY.');?>
@@ -215,7 +217,7 @@ input[type="radio"], input[type="submit"] {
<?php _g('Use a classical installation and see <a href="%s" hreflang="en">upgrade guide</a>.', array($upgradeguide));?>
</p>
- <?php _g('For LiveDVDs, size of the ISOs is about 1.4GB. For the LiveCDs it\'s about 700MB.',null,'p class="dlinfo"');?>
+ <?php _g('For LiveDVDs, size of the ISOs is about %sGB. For the LiveCDs it\'s about %sMB.',array('1.6','700'),'p class="dlinfo"');?>
</div>
<?php } ?>
@@ -272,11 +274,11 @@ input[type="radio"], input[type="submit"] {
<div id="gnomeEx">
<?php _g('GNOME Desktop',null,'h3');?>
- <?php get_image('GNOME', '/g/4/gnome.png', 'width: 100%');?>
+ <?php get_image('GNOME', '/g/5/gnome.png', 'width: 100%');?>
</div>
<div id="kdeEx">
<?php _g('KDE Desktop',null,'h3');?>
- <?php get_image('KDE', '/g/4/kde.png', 'width: 100%');?>
+ <?php get_image('KDE', '/g/5/kde.png', 'width: 100%');?>
</div>
<div class="radiobutton">
@@ -320,7 +322,7 @@ input[type="radio"], input[type="submit"] {
<?php if($dual){?>
<div id='dualEx'>
<?php _g('Dualarch',null,'h3');?>
- <?php _g('The dualarch DVD contains only a minimal list of packages and a lite desktop, %s, to fit on 1GB.',array('RazorQT'),'p');
+ <?php _g('The dualarch DVD contains only a minimal list of packages and a lite desktop, %s, to fit on %sGB.',array('RazorQT','1'),'p');
_g('It can be used to install either a 32bit system or a 64bit system, the installer defaults to x86_64 when it detects a 64bit capable CPU.',null, 'p');
_g('This ISO is generally for advanced users and system administrator for fast deployment of Mageia.',null, 'p');?>
</div>