diff options
-rwxr-xr-x | en/3/download_index.php | 12 | ||||
-rw-r--r-- | langs/en/3.en.lang | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/en/3/download_index.php b/en/3/download_index.php index ca80ba336..ff2baa828 100755 --- a/en/3/download_index.php +++ b/en/3/download_index.php @@ -77,10 +77,10 @@ require '../downloads/get/lib.php'; </div> < <div class="para"> - <h2><?php _e('LiveCDs – LiveDVDs');?></h2> - <p class="dlinfo"><?php _e('Use LiveCDs – LiveDVDs for fresh new installs ONLY.');?> - <span class="warn"><?php _e('DO NOT use those LiveCDs – LiveDVDs to upgrade from Mageia 2!'); ?></span> - <?php _e('Use above DVD or CD and see the <a href="%s" hreflang="en">upgrade guide</a>.', + <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 2!'); ?></span> + <?php _e('Use above DVD or CD and see the upgrade guide. <a href="%s" hreflang="en">upgrade guide</a>.', array('https://wiki.mageia.org/en/Mageia_3_Release_Notes#Upgrading_from_Mageia_2'));?></p> <table class="fr-table dlt2"> <thead> @@ -190,7 +190,7 @@ require '../downloads/get/lib.php'; <?php _h('Looking for Mageia 1?', null, 'h3'); echo '<p>'; - _e('It is <a href="%s">here now</a>.', array('../downloads/1/')); + _e('It is <a href="%s">here now</a>.', array('../1/')); _e('But please remember that it already <a href="http://blog.mageia.org/en/2012/12/02/mageia-1-eol"/>reached EOL</a>.', null, ''); echo '</p>'; ?> @@ -198,7 +198,7 @@ require '../downloads/get/lib.php'; <br> <?php _h('Need more challenge?', null, 'h3'); - _h('You can help us <a href="%s">on Mageia 4</a>.', array('../contribute/')); + _h('You can help us <a href="%s">on Mageia 4</a>.', array('/contribute/')); ?> </div> <hr> diff --git a/langs/en/3.en.lang b/langs/en/3.en.lang index 510215c75..d94378eb7 100644 --- a/langs/en/3.en.lang +++ b/langs/en/3.en.lang @@ -1,4 +1,4 @@ -# Generated by extract2lang.php on 2013-05-17T23:48:22+02:00 +# Generated by extract2lang.php on 2013-05-18T00:15:25+02:00 # Domain 3 # en/3/download_index.php +14 @@ -87,18 +87,18 @@ The CD contains only a minimal list of packages. # en/3/download_index.php +80 -;LiveCDs – LiveDVDs -LiveCDs – LiveDVDs +;LiveCDs and LiveDVDs +LiveCDs and LiveDVDs # en/3/download_index.php +81 -;Use LiveCDs – LiveDVDs for fresh new installs ONLY. -Use LiveCDs – LiveDVDs for fresh new installs ONLY. +;Use LiveCDs and LiveDVDs for fresh new installs ONLY. +Use LiveCDs and LiveDVDs for fresh new installs ONLY. # en/3/download_index.php +82 -;DO NOT use those LiveCDs – LiveDVDs to upgrade from Mageia 2! -DO NOT use those LiveCDs – LiveDVDs to upgrade from Mageia 2! +;DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 2! +DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 2! # en/3/download_index.php +88 |