aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfilip <filip.komar@gmail.com>2018-10-05 22:50:33 +0200
committerfilip <filip.komar@gmail.com>2018-10-05 22:50:33 +0200
commitcadb766a5bfd6925acfc5111907004ce5af5175f (patch)
treeedc0225cca4b4c4c3f69a5cc9afd21a0a3a42ddd
parentf4535dc71e11a25009d47951d259b90f8cccc316 (diff)
mga6.1 release
-rw-r--r--en/6/download_index.php16
-rw-r--r--en/downloads/get/definitions.ini131
-rwxr-xr-xen/index.php4
-rw-r--r--en/timeline/index.php4
4 files changed, 143 insertions, 12 deletions
diff --git a/en/6/download_index.php b/en/6/download_index.php
index d11a59336..21951d733 100644
--- a/en/6/download_index.php
+++ b/en/6/download_index.php
@@ -1,7 +1,7 @@
<?php
$name = 'Mageia';
-$version = '6';
+$version = '6.1';
$release = '';
$torrentavailable=true;
$classical=true;
@@ -131,15 +131,15 @@ input[type="radio"], input[type="submit"], .popover-content {
<p>
<?php _g('If you have <a href="%s">UEFI</a>, a procedure is available in the <a href="%s">wiki</a>.', array(_r('http://en.wikipedia.org/wiki/Unified_Extensible_Firmware_Interface'),_r('https://wiki.mageia.org/en/Installing_on_systems_with_UEFI_firmware' /*this will be changed to tooltip, so no more url*/))) ;?>
</p>
-<?php /* This is i18n text prepared for mga6.1 release:
+<?php
echo '<p>';
- _g('Live Media and Network Installation Media were updated to support new hardware.', null, ' ');
- _g('They are called Mageia 6.1 release to distinguish them from original Mageia 6 release.', null, ' ');
- _g("Use those if Classical Installation Media don't support your hardware even after updating hardware related packages.", null, ' ');
- _g('Please take a look in <a href="%s">documentation</a> for appropriate media.', array('../doc/'), null, ' ');
- _g("There's no need to reinstall if you update your Mageia installation regularly.");
+ _g('Live Media and Network Installation Media have been updated to support new hardware.', null, ' ');
+ _g('They are called Mageia 6.1 release to distinguish them from the original Mageia 6 release.', null, ' ');
+ _g("Use these if the original Mageia 6 iso images are unable to boot on your hardware, or if you would like more up-to-date software while running in live mode.", null, ' ');
+ _g('Please take a look in the <a href="%s">documentation</a> for the appropriate media.', array('../doc/'), null, ' ');
+ _g("There's no need to reinstall if you have Mageia 6 installed and already have the latest updates installed.");
echo '</p>';
-/**/ ?>
+?>
</div>
<div class="para" id="format">
diff --git a/en/downloads/get/definitions.ini b/en/downloads/get/definitions.ini
index 6492e411a..58275775a 100644
--- a/en/downloads/get/definitions.ini
+++ b/en/downloads/get/definitions.ini
@@ -1317,3 +1317,134 @@ torrent = "iso/6/torrents/Mageia-6-x86_64-DVD.torrent"
magnet = "magnet:?xt=urn:btih:062c13a92b9421fccaf3d7e679a70758331130c6&dn=Mageia-6-x86_64-DVD"
name = "Mageia 6 64bit DVD"
size = "3.6 GB"
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;; Mageia 6.1
+;;;;;;;;;;;;;;;;;;;;;
+
+
+;
+[Mageia-6.1-netinstall-i586-CD.iso]
+file = "Mageia-6.1-netinstall-i586.iso"
+path = "distrib/6.1/i586/install/images"
+md5 = "890d25720f9d040e4db8883518d214d9"
+sha512 = "54b6288f67e62e05d8e5c31e1ee3f8ddc47f541d8541667f87153bf1abdf1c6cbdb0470fbf62f14ebd62b2e32dc12f3fccd8add5b56bcac7116ec270a6e50777"
+name = "Mageia 6.1 Netinstall 32bit CD ISO"
+size = "35 MB"
+
+;
+[Mageia-6.1-netinstall-nonfree-i586-CD.iso]
+file = "Mageia-6.1-netinstall-nonfree-i586.iso"
+path = "distrib/6.1/i586/install/images"
+md5 = "140c38aefc3308ecbe3199132a275787"
+sha512 = "d3cf6303520d8edf746ba06fac7647f23cd2bba9cdc1c358ce599600babdbc435c5b6c345f41db1a464beeff53101ed83de8bb431619a3e3a1c877813b9d993e"
+name = "Mageia 6.1 Netinstall Nonfree 32bit CD ISO"
+size= "60 MB"
+
+;
+[Mageia-6.1-netinstall-x86_64-CD.iso]
+file = "Mageia-6.1-netinstall-x86_64.iso"
+path = "distrib/6.1/x86_64/install/images"
+md5 = "0bc22541dd21a7cb8a370a48bef85add"
+sha512 = "f4ccbc62e3546d8ad6ed47a29a074db00cfed4c9f6635c84125325da27abbb677f020b010df5af0fc1d56d269347b55ea526543c16c7a225aabe6059eec6c746"
+name = "Mageia 6.1 Netinstall 64bit CD ISO"
+size = "44 MB"
+
+;
+[Mageia-6.1-netinstall-nonfree-x86_64-CD.iso]
+file = "Mageia-6.1-netinstall-nonfree-x86_64.iso"
+path = "distrib/6.1/x86_64/install/images"
+md5 = "a72d5efa2e2ac49425820072a2faa392"
+sha512 = "5f9a2a1ebf9275f65760a655ab6a740318fd571c1fca39014aa9257f1b0a291c66febcdfaa4f0fee578c35aa560c6cc0eba137a1749111e86b6b0c99d2eed572"
+name = "Mageia 6.1 Netinstall Nonfree 64bit CD ISO"
+size = "72 MB"
+
+;
+[Mageia-6.1-LiveDVD-Xfce-i586-DVD.iso]
+file = "Mageia-6.1-LiveDVD-Xfce-i586-DVD.iso"
+md5 = "4121df29539b4b95969b8e6373676cac"
+md5.gpg = "Mageia-6.1-LiveDVD-Xfce-i586-DVD.md5.gpg"
+sha1 = "66448125d41e56415bc413cfc4a0df06451131a7"
+sha1.gpg = "Mageia-6.1-LiveDVD-Xfce-i586-DVD.sha1.gpg"
+sha512 = "63310d04aa35c51c5a98b8042dd3d702a70052f8fc357fa18a19554f40a4de2cd9e7d81a865a8b63f6449a5f34ad790b224d37302e6629465248933e2f984193"
+sha512.gpg = "Mageia-6.1-LiveDVD-Xfce-i586-DVD.sha512.gpg"
+path = "iso/6.1/Mageia-6.1-LiveDVD-Xfce-i586-DVD"
+torrent = "iso/6.1/torrents/Mageia-6.1-LiveDVD-Xfce-i586-DVD.torrent"
+;magnet = "magnet:?xt=urn:btih:4470093598490d9735bdf3990becb9f8b5bb5076&dn=Mageia-6.1-LiveDVD-Xfce-i586-DVD"
+name = "Mageia 6.1 LiveDVD Xfce 32bit DVD"
+size = "1.9 GB"
+
+;
+[Mageia-6.1-LiveDVD-Xfce-x86_64-DVD.iso]
+file = "Mageia-6.1-LiveDVD-Xfce-x86_64-DVD.iso"
+md5 = "67c662c85d196b956f6b5ed04967c312"
+md5.gpg = "Mageia-6.1-LiveDVD-Xfce-x86_64-DVD.md5.gpg"
+sha1 = "086005020c50ccfbe91a3ef54a1d30a9fec75ea1"
+sha1.gpg = "Mageia-6.1-LiveDVD-Xfce-x86_64-DVD.sha1.gpg"
+sha512 = "834fb5085c7b1b16499c123fb46afc5cc3d31fff109a30f50a95e1b2db294671564543bf9646d677c734373d6263042a7b8dfe6fa4b5e013618693f36cffd6ab"
+sha512.gpg = "Mageia-6.1-LiveDVD-Xfce-x86_64-DVD.sha512.gpg"
+path = "iso/6.1/Mageia-6.1-LiveDVD-Xfce-x86_64-DVD"
+torrent = "iso/6.1/torrents/Mageia-6.1-LiveDVD-Xfce-x86_64-DVD.torrent"
+;magnet = "magnet:?xt=urn:btih:c56dccf013f00defea4c73ab53710e90017d5e99&dn=Mageia-6.1-LiveDVD-Xfce-x86_64-DVD"
+name = "Mageia 6.1 LiveDVD Xfce 64bit DVD"
+size = "1.9 GB"
+;
+[Mageia-6.1-LiveDVD-GNOME-x86_64-DVD.iso]
+file = "Mageia-6.1-LiveDVD-GNOME-x86_64-DVD.iso"
+md5 = "eda8827813246886436cc3d247f8ce9d"
+md5.gpg = "Mageia-6.1-LiveDVD-GNOME-x86_64-DVD.md5.gpg"
+sha1 = "150923e56b005045e0d0b4d4eb22ec9a79c33d6c"
+sha1.gpg = "Mageia-6.1-LiveDVD-GNOME-x86_64-DVD.sha1.gpg"
+sha512 = "6f1e12e32a999565d8c06a32651d48b0a4122d2282b3cf9d383de23cbd433becd50f0bb63845f234ce4787f9d65d506b7c248123e5006905dfea1484df58f1a8"
+sha512.gpg = "Mageia-6.1-LiveDVD-GNOME-x86_64-DVD.sha512.gpg"
+path = "iso/6.1/Mageia-6.1-LiveDVD-GNOME-x86_64-DVD"
+torrent = "iso/6.1/torrents/Mageia-6.1-LiveDVD-GNOME-x86_64-DVD.torrent"
+;magnet = "magnet:?xt=urn:btih:66b272724b0bf8f7deeb7731d6462510f5dc9926&dn=Mageia-6.1-LiveDVD-GNOME-x86_64-DVD"
+name = "Mageia 6.1 LiveDVD GNOME 64bit DVD"
+size = "2.1 GB"
+
+;
+[Mageia-6.1-LiveDVD-Plasma-x86_64-DVD.iso]
+file = "Mageia-6.1-LiveDVD-Plasma-x86_64-DVD.iso"
+md5 = "8c6db848a772edc038771e871a8a7540"
+md5.gpg = "Mageia-6.1-LiveDVD-Plasma-x86_64-DVD.md5.gpg"
+sha1 = "6bc6d43918b080e8e8bee6f16e838d71efcf65c6"
+sha1.gpg = "Mageia-6.1-LiveDVD-Plasma-x86_64-DVD.sha1.gpg"
+sha512 = "8ee3c2d53c865fe54b38505c8ba5bbc737ffabad1d4dc0e00705fd8152e44da7c23ab105983391267d4e706ab04d541cc6611ed116cc124981725cb1d462b5ea"
+sha512.gpg = "Mageia-6.1-LiveDVD-Plasma-x86_64-DVD.sha512.gpg"
+path = "iso/6.1/Mageia-6.1-LiveDVD-Plasma-x86_64-DVD"
+torrent = "iso/6.1/torrents/Mageia-6.1-LiveDVD-Plasma-x86_64-DVD.torrent"
+;magnet = "magnet:?xt=urn:btih:c44b94be80770979448478a3a4b08f5a7bb38006&dn=Mageia-6.1-LiveDVD-Plasma-x86_64-DVD"
+name = "Mageia 6.1 LiveDVD Plasma 64bit DVD"
+size = "2.3 GB"
+
+;
+[Mageia-6.1-i586-DVD.iso]
+file = "Mageia-6-i586-DVD.iso"
+md5 = "7c90caacad20df8d8146ad32d0903554"
+md5.gpg = "Mageia-6-i586-DVD.md5.gpg"
+sha1 = "df3254c07b54a031ed46a8fd61f8a796d71e9467"
+sha1.gpg = "Mageia-6-i586-DVD.sha1.gpg"
+sha512 = "d519376df14aab523f3a347ac0cf8875fadb5cdc8369bfc51d76d7e7083b7613ae52e90e36668c5ab4d82a6124c75d201eae98b24bf5417348f331c1d87d585b"
+sha512.gpg = "Mageia-6-i586-DVD.sha512.gpg"
+path = "iso/6/Mageia-6-i586-DVD"
+torrent = "iso/6/torrents/Mageia-6-i586-DVD.torrent"
+magnet = "magnet:?xt=urn:btih:db82ea94e4ac65b201a4f203397fcf7a2994b043&dn=Mageia-6-i586-DVD"
+name = "Mageia 6 32bit DVD"
+size = "3.7 GB"
+
+;
+[Mageia-6.1-x86_64-DVD.iso]
+file = "Mageia-6-x86_64-DVD.iso"
+md5 = "55e20da532496124e6e720896fdf9fe4"
+md5.gpg = "Mageia-6-x86_64-DVD.md5.gpg"
+sha1 = "03c496389fd39b80107077828a066163d8c38c17"
+sha1.gpg = "Mageia-6-x86_64-DVD.sha1.gpg"
+sha512 = "587b2be3c3bb0d12b0a1980684bec8475d4f692bba2b97c9aa02adb085032728e5bf72fa16def321d46b7b13f68cf95476b9461a97ae01db9102ef2573db7a22"
+sha512.gpg = "Mageia-6-x86_64-DVD.sha512.gpg"
+path = "iso/6/Mageia-6-x86_64-DVD"
+torrent = "iso/6/torrents/Mageia-6-x86_64-DVD.torrent"
+magnet = "magnet:?xt=urn:btih:062c13a92b9421fccaf3d7e679a70758331130c6&dn=Mageia-6-x86_64-DVD"
+name = "Mageia 6 64bit DVD"
+size = "3.6 GB"
diff --git a/en/index.php b/en/index.php
index 2bf892faa..78dca5eb7 100755
--- a/en/index.php
+++ b/en/index.php
@@ -278,8 +278,8 @@ $dictionary = read_translation_file($locale, array('index', 'news', 'common_foot
<span id="dl-btn-mageia">Mageia</span>
<span style="font-size: 32px; color: green; float: right;"></span>
- <span class="dl-btn free-dl"><?php _g('Mageia 6'); // _g('Mageia 6.1'); ?></span>
- <span class="dl-btn"><?php _g('released in July 2017'); ?></span>
+ <span class="dl-btn free-dl"><?php /*_g('Mageia 6'); /**/ _g('Mageia 6.1'); ?></span>
+ <span class="dl-btn"><?php /* _g('released in July 2017'); /**/ _g('updated in October 2018'); ?></span>
</a>
<p class="dl-info">
diff --git a/en/timeline/index.php b/en/timeline/index.php
index 522a90aa1..cd8c86da8 100644
--- a/en/timeline/index.php
+++ b/en/timeline/index.php
@@ -36,9 +36,9 @@ function list_events($events = array())
}
$events = array(
- /*_r('2018') => array(
+ _r('2018') => array(
_r('October') => array(sprintf(_r('<a href=%s>Mageia 6</a> updated to 6.1.'), '"../6/"')),
- ), /**/
+ ),
_r('2017') => array(
_r('July') => array(sprintf(_r('<a href=%s>Mageia 6</a> is released.'), '"../6/"')),
_r('February') => array(_r('Seventh General Assembly during FOSDEM in Brussels, Belgium.')),