aboutsummaryrefslogtreecommitdiffstats
path: root/en
diff options
context:
space:
mode:
authorManuel Hiebel <leuhmanu@mageia.org>2013-12-13 23:30:09 +0000
committerManuel Hiebel <leuhmanu@mageia.org>2013-12-13 23:30:09 +0000
commit62141c65c64de7f7683e69e2de090ae06dad1297 (patch)
tree2923daa8e8e4e82f15453e0dc6fd2bccad923131 /en
parentb319b9880216e145b18b4dad59b6650436dcd512 (diff)
downloadwww-62141c65c64de7f7683e69e2de090ae06dad1297.tar
www-62141c65c64de7f7683e69e2de090ae06dad1297.tar.gz
www-62141c65c64de7f7683e69e2de090ae06dad1297.tar.bz2
www-62141c65c64de7f7683e69e2de090ae06dad1297.tar.xz
www-62141c65c64de7f7683e69e2de090ae06dad1297.zip
Mageia 4 beta2 (with dual as DVD iso)
Diffstat (limited to 'en')
-rwxr-xr-xen/4/download_index.php16
-rw-r--r--en/downloads/get/definitions.ini153
-rw-r--r--en/index.php2
3 files changed, 90 insertions, 81 deletions
diff --git a/en/4/download_index.php b/en/4/download_index.php
index ffa18b047..4373adb33 100755
--- a/en/4/download_index.php
+++ b/en/4/download_index.php
@@ -2,7 +2,7 @@
$name = 'Mageia';
$version = '4';
-$release = 'beta1';
+$release = 'beta2';
define('HLANG', true);
@@ -35,7 +35,7 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
break;
}
- echo $torrent && $unavailabletorrent || $arch=='dual' ? sprintf(_t('forthcoming')) : sprintf('<a rel="nofollow" href="../downloads/get/?q=%s%s" title="%s">%s</a>',
+ 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'),
$torrent ? '&amp;torrent=1' : '',
implode(' ', array($name, $version, $release, $variant, $arch, $medium)),
@@ -108,12 +108,12 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
</td>
</tr>
<tr>
- <th class="name">CD</th>
- <td class="size">700MB</td>
+ <th class="name">DVD dualarch</th>
+ <td class="size">1GB</td>
<td>
- <?php dl_link($name,$version,$release,null,'dual','CD',false);;
+ <?php dl_link($name,$version,$release,null,'dual','DVD',false);;
echo '</td><td>';
- dl_link($name,$version,$release,null,'dual','CD',true);?>
+ dl_link($name,$version,$release,null,'dual','DVD',true);?>
</td>
</tr>
</tbody>
@@ -218,7 +218,7 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
<tbody>
<tr>
<th><?php _e('Network installer, Free Software CD')?></th>
- <td class="size">~27MB<br>~36MB</td>
+ <td class="size">~27MB</td>
<td><?php dl_link($name,$version,$release,'Boot','i586','CD',false);
echo '<br>';
dl_link($name,$version,$release,'Boot','x86_64','CD',false);?>
@@ -227,7 +227,7 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
<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">~27MB<br>~36MB</td>
+ <td class="size">~36MB</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);?>
diff --git a/en/downloads/get/definitions.ini b/en/downloads/get/definitions.ini
index 16d3da057..e22468130 100644
--- a/en/downloads/get/definitions.ini
+++ b/en/downloads/get/definitions.ini
@@ -542,39 +542,39 @@ size = "3.7 GB"
;;;;; Mageia 4
;;;;;;;;;;;;;;;;;;;;;
-[Mageia-4-beta1-Boot-i586-CD.iso]
+[Mageia-4-beta2-Boot-i586-CD.iso]
file = boot.iso
path = "distrib/cauldron/i586/install/images"
-md5 = "762c1ed8dc70c1e46f3aeb21212496b7"
+md5 = "11e5db99684612a0353d1e46b77ee58b"
sha1 = "md5 and sha1 changes frequently"
-name = "Mageia 4 beta1 Boot 32bit CD ISO"
+name = "Mageia 4 beta2 Boot 32bit CD ISO"
size = "27 MB"
;
-[Mageia-4-beta1-Boot-nonfree-i586-CD.iso]
+[Mageia-4-beta2-Boot-nonfree-i586-CD.iso]
file = boot-nonfree.iso
path = "distrib/cauldron/i586/install/images"
-md5 = "49432fdeaca664f6b721ff7021e34f0d"
+md5 = "7eb58f9f7649e5bc18bdfbbbd4cebf28"
sha1 = "md5 and sha1 changes frequently"
-name = "Mageia 4 beta1 Boot Nonfree 32bit CD ISO"
+name = "Mageia 4 beta2 Boot Nonfree 32bit CD ISO"
size= "36 MB"
;
-[Mageia-4-beta1-Boot-x86_64-CD.iso]
+[Mageia-4-beta2-Boot-x86_64-CD.iso]
file = boot.iso
path = "distrib/cauldron/x86_64/install/images"
-md5 = "c71d733a65f03d7b02c19326c1f4beb0"
+md5 = "2f1e607544b4d63f93372f3a43ec7cd9"
sha1 = "md5 and sha1 changes frequently"
-name = "Mageia 4 beta1 Boot 64bit CD ISO"
+name = "Mageia 4 beta2 Boot 64bit CD ISO"
size = "27 MB"
;
-[Mageia-4-beta1-Boot-nonfree-x86_64-CD.iso]
+[Mageia-4-beta2-Boot-nonfree-x86_64-CD.iso]
file = boot-nonfree.iso
path = "distrib/cauldron/x86_64/install/images"
-md5 = "fc9a027d61cacf1fbbeb15a9bb506850"
+md5 = "aec53c870b5592620921bddc792732c3"
sha1 = "md5 and sha1 changes frequently"
-name = "Mageia 4 beta1 Boot Nonfree 64bit CD ISO"
+name = "Mageia 4 beta2 Boot Nonfree 64bit CD ISO"
size ="36 MB"
@@ -582,91 +582,100 @@ size ="36 MB"
;from fidd
-,
;
;
-[Mageia-4-beta1-LiveCD-GNOME-en-i586-CD.iso]
-file = "Mageia-4-beta1-LiveCD-GNOME-en-i586-CD.iso"
-md5 = "e3ecd710ea104d15cf939c505a9ca494"
-sha1 = "eb85e67e493f98ef994281c6f3cda49432bfb126"
+[Mageia-4-beta2-LiveCD-GNOME-en-i586-CD.iso]
+file = "Mageia-4-beta2-LiveCD-GNOME-en-i586-CD.iso"
+md5 = "e89272170feb156c6eca261f0d1dbce7"
+sha1 = "5847f993ed1b2f35a01e9df884b8d45c09b1f996"
langs = "English (Australia) (en_AU), English (Canada) (en_CA), English (en_GB), English (Ireland) (en_IE), English (New-Zealand) (en_NZ), English (American) (en_US), English (South Africa) (en_ZA)"
-path = "iso/cauldron/Mageia-4-beta1-LiveCD-GNOME-en-i586-CD"
-torrent = "iso/cauldron/torrents/Mageia-4-beta1-LiveCD-GNOME-en-i586-CD.torrent"
-name = "Mageia 4 beta1 LiveCD GNOME en 32bit CD"
-size = "683 MB"
+path = "iso/cauldron/Mageia-4-beta2-LiveCD-GNOME-en-i586-CD"
+torrent = "iso/cauldron/torrents/Mageia-4-beta2-LiveCD-GNOME-en-i586-CD.torrent"
+name = "Mageia 4 beta2 LiveCD GNOME en 32bit CD"
+size = "679 MB"
;
-[Mageia-4-beta1-LiveCD-KDE4-en-i586-CD.iso]
-file = "Mageia-4-beta1-LiveCD-KDE4-en-i586-CD.iso"
-md5 = "658fdf7bfb6fd5942c7be061106ae6ce"
-sha1 = "6a72b5564945e8a97c7a5ce9ada67cbeda8ef6d0"
+[Mageia-4-beta2-LiveCD-KDE4-en-i586-CD.iso]
+file = "Mageia-4-beta2-LiveCD-KDE4-en-i586-CD.iso"
+md5 = "1926aa20703e1ecb36601f57cac8c107"
+sha1 = "1e96396adeb98870f25e06dd4fe32090d6a26e5e"
langs = "English (Australia) (en_AU), English (Canada) (en_CA), English (en_GB), English (Ireland) (en_IE), English (New-Zealand) (en_NZ), English (American) (en_US), English (South Africa) (en_ZA)"
-path = "iso/cauldron/Mageia-4-beta1-LiveCD-KDE4-en-i586-CD"
-torrent = "iso/cauldron/torrents/Mageia-4-beta1-LiveCD-KDE4-en-i586-CD.torrent"
-name = "Mageia 4 beta1 LiveCD KDE4 en 32bit CD"
-size = "658 MB"
+path = "iso/cauldron/Mageia-4-beta2-LiveCD-KDE4-en-i586-CD"
+torrent = "iso/cauldron/torrents/Mageia-4-beta2-LiveCD-KDE4-en-i586-CD.torrent"
+name = "Mageia 4 beta2 LiveCD KDE4 en 32bit CD"
+size = "660 MB"
;
-[Mageia-4-beta1-LiveDVD-GNOME-i586-DVD.iso]
-file = "Mageia-4-beta1-LiveDVD-GNOME-i586-DVD.iso"
-md5 = "8542fa1e21f83462665b1f2c17e1aab7"
-sha1 = "44b4597b89638264765b3099b4470d8f524f473e"
+[Mageia-4-beta2-LiveDVD-GNOME-i586-DVD.iso]
+file = "Mageia-4-beta2-LiveDVD-GNOME-i586-DVD.iso"
+md5 = "0c8c453dbe7d98df39a19eb70632a873"
+sha1 = "d471dc995ada9de18de02734313d82044acc6d9f"
langs = "English (American) (en_US)"
-path = "iso/cauldron/Mageia-4-beta1-LiveDVD-GNOME-i586-DVD"
-torrent = "iso/cauldron/torrents/Mageia-4-beta1-LiveDVD-GNOME-i586-DVD.torrent"
-name = "Mageia 4 beta1 LiveDVD GNOME 32bit DVD"
+path = "iso/cauldron/Mageia-4-beta2-LiveDVD-GNOME-i586-DVD"
+torrent = "iso/cauldron/torrents/Mageia-4-beta2-LiveDVD-GNOME-i586-DVD.torrent"
+name = "Mageia 4 beta2 LiveDVD GNOME 32bit DVD"
size = "1.4 GB"
;
-[Mageia-4-beta1-LiveDVD-GNOME-x86_64-DVD.iso]
-file = "Mageia-4-beta1-LiveDVD-GNOME-x86_64-DVD.iso"
-md5 = "ca03afa6e42e75cfea7ea56c30c0498c"
-sha1 = "838742574dd280971016c41c9f0f9443f259cc7e"
+[Mageia-4-beta2-LiveDVD-GNOME-x86_64-DVD.iso]
+file = "Mageia-4-beta2-LiveDVD-GNOME-x86_64-DVD.iso"
+md5 = "aa357504fe3861f69bd8f54cad293487"
+sha1 = "6f6ca6be8266f3576b8e62805d11546c7fbfba9a"
langs = "English (American) (en_US)"
-path = "iso/cauldron/Mageia-4-beta1-LiveDVD-GNOME-x86_64-DVD"
-torrent = "iso/cauldron/torrents/Mageia-4-beta1-LiveDVD-GNOME-x86_64-DVD.torrent"
-name = "Mageia 4 beta1 LiveDVD GNOME 64bit DVD"
+path = "iso/cauldron/Mageia-4-beta2-LiveDVD-GNOME-x86_64-DVD"
+torrent = "iso/cauldron/torrents/Mageia-4-beta2-LiveDVD-GNOME-x86_64-DVD.torrent"
+name = "Mageia 4 beta2 LiveDVD GNOME 64bit DVD"
size = "1.4 GB"
;
-[Mageia-4-beta1-LiveDVD-KDE4-i586-DVD.iso]
-file = "Mageia-4-beta1-LiveDVD-KDE4-i586-DVD.iso"
-md5 = "34b64c7f0dec53c99afc775018577220"
-sha1 = "3e29ec69da884b1271969342f3bf3a77b911990f"
+[Mageia-4-beta2-LiveDVD-KDE4-i586-DVD.iso]
+file = "Mageia-4-beta2-LiveDVD-KDE4-i586-DVD.iso"
+md5 = "f01d70483f1e22e112a6a3e48a82bbf9"
+sha1 = "7eafb9e80841f1eb53501d01e0118a87aba8df51"
langs = "English (American) (en_US)"
-path = "iso/cauldron/Mageia-4-beta1-LiveDVD-KDE4-i586-DVD"
-torrent = "iso/cauldron/torrents/Mageia-4-beta1-LiveDVD-KDE4-i586-DVD.torrent"
-name = "Mageia 4 beta1 LiveDVD KDE4 32bit DVD"
+path = "iso/cauldron/Mageia-4-beta2-LiveDVD-KDE4-i586-DVD"
+torrent = "iso/cauldron/torrents/Mageia-4-beta2-LiveDVD-KDE4-i586-DVD.torrent"
+name = "Mageia 4 beta2 LiveDVD KDE4 32bit DVD"
size = "1.4 GB"
;
-[Mageia-4-beta1-LiveDVD-KDE4-x86_64-DVD.iso]
-file = "Mageia-4-beta1-LiveDVD-KDE4-x86_64-DVD.iso"
-md5 = "4ba32ef6e235e0ecfc454fd6bc7185c0"
-sha1 = "c59c4c1b98d38ff0aee81e04e191fd72e2deea99"
+[Mageia-4-beta2-LiveDVD-KDE4-x86_64-DVD.iso]
+file = "Mageia-4-beta2-LiveDVD-KDE4-x86_64-DVD.iso"
+md5 = "4f34857d09de2253c47ba99935ecf98d"
+sha1 = "50e7f7968ecbd04fc2cf30c3660ab3bca75717d2"
langs = "English (American) (en_US)"
-path = "iso/cauldron/Mageia-4-beta1-LiveDVD-KDE4-x86_64-DVD"
-torrent = "iso/cauldron/torrents/Mageia-4-beta1-LiveDVD-KDE4-x86_64-DVD.torrent"
-name = "Mageia 4 beta1 LiveDVD KDE4 64bit DVD"
+path = "iso/cauldron/Mageia-4-beta2-LiveDVD-KDE4-x86_64-DVD"
+torrent = "iso/cauldron/torrents/Mageia-4-beta2-LiveDVD-KDE4-x86_64-DVD.torrent"
+name = "Mageia 4 beta2 LiveDVD KDE4 64bit DVD"
size = "1.5 GB"
;
-[Mageia-4-beta1-i586-DVD.iso]
-file = "Mageia-4-beta1-i586-DVD.iso"
-md5 = "c659504f97d23a61ea346f0b4aecb5e3"
-sha1 = "c29ad967929d62f15973c4d3609a727c13878f77"
-path = "iso/cauldron/Mageia-4-beta1-i586-DVD"
-torrent = "iso/cauldron/torrents/Mageia-4-beta1-i586-DVD.torrent"
-name = "Mageia 4 beta1 32bit DVD"
-size = "3.6 GB"
+[Mageia-4-beta2-dual-DVD.iso]
+file = "Mageia-4-beta2-dual-DVD.iso"
+md5 = "fdd6185b7827b306f5a2a7fef6812c49"
+sha1 = "8097440324ea08f1383b928382e4315dfba10a74"
+path = "iso/cauldron/Mageia-4-beta2-dual-DVD"
+torrent = "iso/cauldron/torrents/Mageia-4-beta2-dual-DVD.torrent"
+name = "Mageia 4 beta2 dual DVD"
+size = "1 GB"
;
-[Mageia-4-beta1-x86_64-DVD.iso]
-file = "Mageia-4-beta1-x86_64-DVD.iso"
-md5 = "4cdbf34df22e20bdebd5f13e265a4771"
-sha1 = "a6896e2c478b852dbc90e2ca271daba8732f966f"
-path = "iso/cauldron/Mageia-4-beta1-x86_64-DVD"
-torrent = "iso/cauldron/torrents/Mageia-4-beta1-x86_64-DVD.torrent"
-name = "Mageia 4 beta1 64bit DVD"
+[Mageia-4-beta2-i586-DVD.iso]
+file = "Mageia-4-beta2-i586-DVD.iso"
+md5 = "afa1fdc44825d58f406e472c4dd0f8da"
+sha1 = "5ceb20cd68bc39a3b2762297e2de9a77a6bec47b"
+path = "iso/cauldron/Mageia-4-beta2-i586-DVD"
+torrent = "iso/cauldron/torrents/Mageia-4-beta2-i586-DVD.torrent"
+name = "Mageia 4 beta2 32bit DVD"
size = "3.6 GB"
+
+;
+[Mageia-4-beta2-x86_64-DVD.iso]
+file = "Mageia-4-beta2-x86_64-DVD.iso"
+md5 = "a8a021d79fac60a2416ed9fe162315a5"
+sha1 = "2c2ade58d0030661eeff4f3c79a11dcffb09adc9"
+path = "iso/cauldron/Mageia-4-beta2-x86_64-DVD"
+torrent = "iso/cauldron/torrents/Mageia-4-beta2-x86_64-DVD.torrent"
+name = "Mageia 4 beta2 64bit DVD"
+size = "3.7 GB
diff --git a/en/index.php b/en/index.php
index 2486c328e..3b41b6a76 100644
--- a/en/index.php
+++ b/en/index.php
@@ -246,7 +246,7 @@ $nav = array(
</li>
<li><a href="contribute/" class="dl-btn-other"><?php _e('<strong>Get involved</strong> in the next version'); ?></a>
</li>
- <li><a href="4/" class="dl-btn-other"><?php _e('Test'); ?> Mageia 4 beta 1</a>
+ <li><a href="4/" class="dl-btn-other"><?php _e('Test'); ?> Mageia 4 beta 2</a>
</li>
</ul>
</div>
generated by cgit v1.2.1 (git 2.21.0) at 2024-05-13 20:32:09 +0000