diff options
| -rwxr-xr-x | en/6/download_index.php | 32 | ||||
| -rw-r--r-- | en/6/nav.php | 12 | ||||
| -rw-r--r-- | en/downloads/get/definitions.ini | 126 | ||||
| -rw-r--r-- | en/index.php | 2 |
4 files changed, 112 insertions, 60 deletions
diff --git a/en/6/download_index.php b/en/6/download_index.php index dbf21e3f4..511cb1721 100755 --- a/en/6/download_index.php +++ b/en/6/download_index.php @@ -2,10 +2,10 @@ $name = 'Mageia'; $version = '6'; -$release = 'dev1'; +$release = 'sta1'; $torrentavailable=true; $classical=true; -$live=false; +$live=true; $dual=false; @@ -141,9 +141,9 @@ input[type="radio"], input[type="submit"] { <h1 id="mgnavt"><?php echo sprintf(_g('Download') . ' <strong>%s %s %s</strong>',$name, $version, $release)?></h1> <?php include '../6/nav.php'; ?> <p class="unstable-release-warning"><?php - _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('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 %s.', array(_r('May 2015'))); _g('Release Candidate is intended to identify any remaining bugs or missing packages.'); ?></p> @@ -253,17 +253,17 @@ input[type="radio"], input[type="submit"] { _g('LiveDVDs contain all languages and is available in both 32 and 64bit.',null,'p');?> </div> - <div id="livecdEx"> +<!-- <div id="livecdEx"> <?php _g('LiveCDs',null,'h3'); _g('LiveCDs contain only English and is available only in 32bit.',null,'p'); _g('Do not use unless you really DON\'T NEED any other language than English.',null,'p class="warn"'); ?> - </div> + </div>--> <div class="radiobutton"> <input type="radio" id="livedvd" value="DVD" name="livespin" /> <label for="livedvd" class="ui-button livedvd"><?php _g('LiveDVDs')?></label> - <input type="radio" id="livecd" value="CD" name="livespin" /> - <label for="livecd" class="ui-button livecd"><?php _g('English only (CD)')?></label> + <!--<input type="radio" id="livecd" value="CD" name="livespin" /> + <label for="livecd" class="ui-button livecd"><?php _g('English only (CD)')?></label>--> </div> </div> @@ -280,7 +280,7 @@ input[type="radio"], input[type="submit"] { </div> <div class="radiobutton"> - <input type="radio" id="kde" value="KDE4" name="desktop" /> + <input type="radio" id="kde" value="PLASMA5" name="desktop" /> <label for="kde" class="ui-button kde"><?php _g('KDE Desktop')?></label> <input type="radio" id="gnome" value="GNOME" name="desktop" /> <label for="gnome" class="ui-button gnome"><?php _g('GNOME Desktop')?></label> @@ -415,13 +415,13 @@ input[type="radio"], input[type="submit"] { <tr> <th class="name" style="width:60%">LiveDVD KDE</th> <td> - <?php dl_link($name,$version,$release,'LiveDVD-KDE4','i586','DVD',false); + <?php dl_link($name,$version,$release,'LiveDVD-PLASMA5','i586','DVD',false); echo '<br>'; - dl_link($name,$version,$release,'LiveDVD-KDE4','x86_64','DVD',false); + dl_link($name,$version,$release,'LiveDVD-PLASMA5','x86_64','DVD',false); echo '</td><td>'; - dl_link($name,$version,$release,'LiveDVD-KDE4','i586','DVD',true,$torrentavailable); + dl_link($name,$version,$release,'LiveDVD-PLASMA5','i586','DVD',true,$torrentavailable); echo '<br>'; - dl_link($name,$version,$release,'LiveDVD-KDE4','x86_64','DVD',true,$torrentavailable);?> + dl_link($name,$version,$release,'LiveDVD-PLASMA5','x86_64','DVD',true,$torrentavailable);?> </td> </tr> <tr> @@ -438,9 +438,9 @@ input[type="radio"], input[type="submit"] { <tr> <th class="name">LiveCD KDE</th> <td> - <?php dl_link($name,$version,$release,'LiveCD-KDE4-en','i586','CD',false); + <?php dl_link($name,$version,$release,'LiveCD-PLASMA5-en','i586','CD',false); echo '</td><td>'; - dl_link($name,$version,$release,'LiveCD-KDE4-en','i586','CD',true,$torrentavailable);?> + dl_link($name,$version,$release,'LiveCD-PLASMA5-en','i586','CD',true,$torrentavailable);?> </td> </tr> <tr> diff --git a/en/6/nav.php b/en/6/nav.php index 44aee544a..a252da9d8 100644 --- a/en/6/nav.php +++ b/en/6/nav.php @@ -4,14 +4,14 @@ $releasenotes = ''; $errata = ''; $upgradeguide = ''; -// $releasenotes = _r_NOT_YET('https://wiki.mageia.org/en/Mageia_6_Release_Notes'); -// $errata = _r_NOT_YET('https://wiki.mageia.org/en/Mageia_6_Errata'); -// $upgradeguide = _r_NOT_YET('https://wiki.mageia.org/en/Mageia_6_Release_Notes#Upgrading_from_Mageia_5'); +$releasenotes = _r('https://wiki.mageia.org/en/Mageia_6_Release_Notes'); +$errata = _r('https://wiki.mageia.org/en/Mageia_6_Errata'); +$upgradeguide = _r('https://wiki.mageia.org/en/Mageia_6_Release_Notes#Upgrading_from_Mageia_5'); $nav = array( -// _r_NOT_YET("https://wiki.mageia.org/en/Mageia_5_Development#Development_Planning") => _r('Development roadmap'), -// _r_NOT_YET("https://wiki.mageia.org/en/FeatureMageia5_Review") => _r('Features review'), -// $releasenotes => _r('Release notes'), + _r("https://wiki.mageia.org/en/Mageia_6_Development") => _r('Development roadmap'), + _r("https://wiki.mageia.org/en/FeatureMageia6_Review") => _r('Features review'), + $releasenotes => _r('Release notes'), $errata => _r('Errata'), "//bugs.mageia.org/" => _r('Bugs Reports'), ); diff --git a/en/downloads/get/definitions.ini b/en/downloads/get/definitions.ini index e840a084a..0e4150bc1 100644 --- a/en/downloads/get/definitions.ini +++ b/en/downloads/get/definitions.ini @@ -976,62 +976,114 @@ size = "3.6 GB" ;;;;;;;;;;;;;;;;;;;;; ; -[Mageia-6-dev1-i586-DVD.iso] -file = "Mageia-6-dev1-i586-DVD.iso" -md5 = "2105eb0dd0933c45982526be3e106b57" -md5.gpg = "Mageia-6-dev1-i586-DVD.iso.md5.gpg" -sha1 = "19672795f8644413e162dc9e42dadb4bf03f9330" -sha1.gpg = "Mageia-6-dev1-i586-DVD.iso.sha1.gpg" -sha512 = "ece09eec96e0bab51e892de5b677400a8e9a9dbd12e3eae75a8d578edcf475a71e38780bd74839a8cc9539cafeaff3ca53dd52421b61a4a8312e5508b4cd24c1" -path = "iso/cauldron/Mageia-6-dev1-i586-DVD" -torrent = "iso/cauldron/torrents/Mageia-6-dev1-i586-DVD.torrent" -name = "Mageia 6 dev1 32bit DVD" -size = "3.9 GB" - -; -[Mageia-6-dev1-x86_64-DVD.iso] -file = "Mageia-6-dev1-x86_64-DVD.iso" -md5 = "3888434ac95d0b98b957cf10f4b95e79" -md5.gpg = "Mageia-6-dev1-x86_64-DVD.iso.md5.gpg" -sha1 = "167e8a0b310f99c2c10415fc28de65eb233123e2" -sha1.gpg = "Mageia-6-dev1-x86_64-DVD.iso.sha1.gpg" -sha512 = "425250773939e06ee652075b72b15f56010a39e036e8772e7d8ae2539f48b0935bf316ed7df950007d264a546bbf5e4520c3c5edf9a6e4f7b5011022d31a4028" -path = "iso/cauldron/Mageia-6-dev1-x86_64-DVD" -torrent = "iso/cauldron/torrents/Mageia-6-dev1-x86_64-DVD.torrent" -name = "Mageia 6 dev1 64bit DVD" -size = "4.3 GB" - -[Mageia-6-dev1-Boot-i586-CD.iso] +[Mageia-6-sta1-LiveDVD-GNOME-i586-DVD.iso] +file = "Mageia-6-sta1-LiveDVD-GNOME-i586-DVD.iso" +md5 = "38a32226e7c9ab98a846023f602c99e3" +md5.gpg = "Mageia-6-sta1-LiveDVD-GNOME-i586-DVD.iso.md5.gpg" +sha1 = "fe231e3a9954bfd467f6a0b3272e4caff9bc255c" +sha1.gpg = "Mageia-6-sta1-LiveDVD-GNOME-i586-DVD.iso.sha1.gpg" +sha512 = "b258078e63c6d66b603ceb1cad7751b2219b91ade1ec0ff8c0490f1959ca4bb5b859a483fc5286e5cfea4f811d9329f734358eca1c19657974b0c74948ce27e8" +path = "iso/cauldron/Mageia-6-sta1-LiveDVD-GNOME-i586-DVD" +torrent = "iso/cauldron/torrents/Mageia-6-sta1-LiveDVD-GNOME-i586-DVD.torrent" +name = "Mageia 6 sta1 32bit DVD" +size = "1.5 GB" + +; +[Mageia-6-sta1-LiveDVD-GNOME-x86_64-DVD.iso] +file = "Mageia-6-sta1-LiveDVD-GNOME-x86_64-DVD.iso" +md5 = "accdb81da30cba57a330ef89f9571739" +md5.gpg = "Mageia-6-sta1-LiveDVD-GNOME-x86_64-DVD.iso.md5.gpg" +sha1 = "5c00ff3aed050fa06c4617c4a1c0f79d79b4bfba" +sha1.gpg = "Mageia-6-sta1-LiveDVD-GNOME-x86_64-DVD.iso.sha1.gpg" +sha512 = "d580f549e6f3d173a51bd31942e36b878f673de221b1087668544577738be28e64708cbc6ebcc347acf2cd16439287e6f1ca9c691068b9bcbc33af00b9932335" +path = "iso/cauldron/Mageia-6-sta1-LiveDVD-GNOME-x86_64-DVD" +torrent = "iso/cauldron/torrents/Mageia-6-sta1-LiveDVD-GNOME-x86_64-DVD.torrent" +name = "Mageia 6 sta1 32bit DVD" +size = "1.5 GB" + +; +[Mageia-6-sta1-LiveDVD-PLASMA5-i586-DVD.iso] +file = "Mageia-6-sta1-LiveDVD-PLASMA5-i586-DVD.iso" +md5 = "33b4d12049261fd294ffc87eba7faa4b" +md5.gpg = "Mageia-6-sta1-LiveDVD-PLASMA5-i586-DVD.iso.md5.gpg" +sha1 = "7f23806b3c4df353419b09bae942be47ae45041c" +sha1.gpg = "Mageia-6-sta1-LiveDVD-PLASMA5-i586-DVD.iso.sha1.gpg" +sha512 = "f90433ac50618b29750b01c2e99b966c8bdfe07046398bb7ac21b0def86e740d3a57adbc7532a13a4c96da1e0b23885d17ec7d0aa39caa27896cb56cd314d48f" +path = "iso/cauldron/Mageia-6-sta1-LiveDVD-PLASMA5-i586-DVD" +torrent = "iso/cauldron/torrents/Mageia-6-sta1-LiveDVD-PLASMA5-i586-DVD.torrent" +name = "Mageia 6 sta1 32bit DVD" +size = "1.8 GB" + +; +[Mageia-6-sta1-LiveDVD-PLASMA5-x86_64-DVD.iso] +file = "Mageia-6-sta1-LiveDVD-PLASMA5-x86_64-DVD.iso" +md5 = "eb66a13cd2b0f6686be96382329d0798" +md5.gpg = "Mageia-6-sta1-LiveDVD-PLASMA5-x86_64-DVD.iso.md5.gpg" +sha1 = "66baaffeb7546c859bb88749166a5a064f5fb6a3" +sha1.gpg = "Mageia-6-sta1-LiveDVD-PLASMA5-x86_64-DVD.iso.sha1.gpg" +sha512 = "5cbc78811134f3f3d052904202ec217a5a54893b9b5b927c25827c111ebbffca5f461522db007c5f9712c57214a47962e7427b4f0bd9093873dbd1dc592b9c63" +path = "iso/cauldron/Mageia-6-sta1-LiveDVD-PLASMA5-x86_64-DVD" +torrent = "iso/cauldron/torrents/Mageia-6-sta1-LiveDVD-PLASMA5-x86_64-DVD.torrent" +name = "Mageia 6 sta1 32bit DVD" +size = "1.8 GB" + +; +[Mageia-6-sta1-i586-DVD.iso] +file = "Mageia-6-sta1-i586-DVD.iso" +md5 = "bbffcbb44580c2041f34153f0043514e" +md5.gpg = "Mageia-6-sta1-i586-DVD.iso.md5.gpg" +sha1 = "9754979cdbf311095797e0f646af16b1e86bb74f" +sha1.gpg = "Mageia-6-sta1-i586-DVD.iso.sha1.gpg" +sha512 = "d5484144062d3e7412945b88d4d1e2248623a81976a5baf7dee659b6cf475cb1029f1d678a3dc8ef718815dbde2dae3cb93fea283f99a654907bccf33cabcc3c" +path = "iso/cauldron/Mageia-6-sta1-i586-DVD" +torrent = "iso/cauldron/torrents/Mageia-6-sta1-i586-DVD.torrent" +name = "Mageia 6 sta1 32bit DVD" +size = "3.7 GB" + +; +[Mageia-6-sta1-x86_64-DVD.iso] +file = "Mageia-6-sta1-x86_64-DVD.iso" +md5 = "4adb34686cf20a42bb0578bea20002a5" +md5.gpg = "Mageia-6-sta1-x86_64-DVD.iso.md5.gpg" +sha1 = "79a50752236e86adac963a34e8764d7205ca32bd" +sha1.gpg = "Mageia-6-sta1-x86_64-DVD.iso.sha1.gpg" +sha512 = "ef6cf76618e3ce30dd07913c1d379d2481b996640c26a34c311cb9776c94d57c1509d3cda57b52307dafd5125c22510d82d558dafc9e57e222fab7160024791b" +path = "iso/cauldron/Mageia-6-sta1-x86_64-DVD" +torrent = "iso/cauldron/torrents/Mageia-6-sta1-x86_64-DVD.torrent" +name = "Mageia 6 sta1 64bit DVD" +size = "3.7 GB" + +[Mageia-6-sta1-Boot-i586-CD.iso] file = "Mageia-Cauldron-netinstall-i586.iso" path = "distrib/cauldron/i586/install/images" md5 = "changes frequently" sha1 = "changes frequently" -name = "Mageia 6 dev1 Boot 32bit CD ISO" +name = "Mageia 6 sta1 Boot 32bit CD ISO" size = "33 MB" ; -[Mageia-6-dev1-Boot-nonfree-i586-CD.iso] +[Mageia-6-sta1-Boot-nonfree-i586-CD.iso] file = "Mageia-Cauldron-netinstall-nonfree-i586.iso" path = "distrib/cauldron/i586/install/images" md5 = "changes frequently" sha1 = "changes frequently" -name = "Mageia 6 dev1 Boot Nonfree 32bit CD ISO" +name = "Mageia 6 sta1 Boot Nonfree 32bit CD ISO" size= "50 MB" ; -[Mageia-6-dev1-Boot-x86_64-CD.iso] -file = "Mageia-Cauldron-netinstall-x86_64.iso" +[Mageia-6-sta1-Boot-x86_64-CD.iso] +file = "Mageia-Cauldron-all-x86_64.img" path = "distrib/cauldron/x86_64/install/images" md5 = "changes frequently" sha1 = "changes frequently" -name = "Mageia 6 dev1 Boot 64bit CD ISO" -size = "40 MB" +name = "Mageia 6 sta1 Boot 64bit CD ISO" +size = "33 MB" ; -[Mageia-6-dev1-Boot-nonfree-x86_64-CD.iso] -file = "Mageia-Cauldron-netinstall-nonfree-x86_64.iso" +[Mageia-6-sta1-Boot-nonfree-x86_64-CD.iso] +file = "Mageia-Cauldron-all-nonfree-x86_64.img" path = "distrib/cauldron/x86_64/install/images" md5 = "changes frequently" sha1 = "changes frequently" -name = "Mageia 6 dev1 Boot Nonfree 64bit CD ISO" -size = "57 MB"
\ No newline at end of file +name = "Mageia 6 sta1 Boot Nonfree 64bit CD ISO" +size = "50 MB"
\ No newline at end of file diff --git a/en/index.php b/en/index.php index a72dd5339..8885cb3b3 100644 --- a/en/index.php +++ b/en/index.php @@ -271,7 +271,7 @@ $dictionary = read_translation_file($locale, array('index', 'news', 'common_foot </li> <li><a href="contribute/" class="dl-btn-other"><?php _g('<strong>Get involved</strong> in the next version'); ?></a> </li> - <li><a href="6/" class="dl-btn-other"><?php _g('Test'); ?> Mageia 6 dev1</a></li> + <li><a href="6/" class="dl-btn-other"><?php _g('Test'); ?> Mageia 6 sta1</a></li> </ul> </div> |