pushed mga3 beta2

2 files changed, 102 insertions, 102 deletions

diff --git a/en/3/index.php b/en/3/index.php
index 4c5ed8eb5..865af7db4 100644
--- a/en/3/index.php
+++ b/en/3/index.php
@@ -34,7 +34,7 @@ _lang_load($locale, '3');
             <ul>
                 <li><a href="https://wiki.mageia.org/en/Mageia_3_development#Development_Planning"><?php _e('Development roadmap')?></a></li>
                 <li><a href="https://wiki.mageia.org/en/FeatureMageia3_Review"><?php _e('Features review')?></a></li>
-                <li><a href="https://wiki.mageia.org/en/Mageia_3_beta1"><?php _e('Release notes')?></a></li>
+                <li><a href="https://wiki.mageia.org/en/Mageia_3_beta2"><?php _e('Release notes')?></a></li>
                 <li><a href="https://wiki.mageia.org/en/Mageia_3_Errata"><?php _e('Errata')?></a></li>
                 <li><a href="//bugs.mageia.org/"><?php _e('Bugs Reports')?></a></li>
             </ul>
@@ -43,7 +43,7 @@ _lang_load($locale, '3');
             <p class="unstable-release-warning"><?php _e('Be careful! This is a beta, unstable release.');
                 _e('It is only intended for developer use. DO NOT USE THIS IN PRODUCTION OR FOR OFFICIAL REVIEW.'); ?></p>
             <div class="para">
-                <h2><?php _e('Download %s', array('Mageia 3 beta1')); ?></h2>
+                <h2><?php _e('Download %s', array('Mageia 3 beta2')); ?></h2>
                 <ul class="dlinfo hl">
                     <li><?php _e('Up to 167 locales are supported:'); ?>
                         Deutsch, English, español, français, italiano, português, svenska, nederlands,
@@ -74,18 +74,18 @@ _lang_load($locale, '3');
                         <th class="name"><?php _e('Installer DVD')?><br>
                             <span class="dlinfo"><?php _e('Free Software and some proprietary drivers')?></span></th>
                         <td class="size">3.6GB</td>
-                        <td><a rel="nofollow" href="?q=Mageia-3-beta1-i586-DVD.iso"><?php _e('32bit');?></a><br>
-                            <a rel="nofollow" href="?q=Mageia-3-beta1-x86_64-DVD.iso"><?php _e('64bit');?></a></td>
-                        <td><a rel="nofollow" href="?q=Mageia-3-beta1-i586-DVD.iso&amp;torrent=1"><?php _e('32bit');?></a><br>
-                            <a rel="nofollow" href="?q=Mageia-3-beta1-x86_64-DVD.iso&amp;torrent=1"><?php _e('64bit');?></a></td>
+                        <td><a rel="nofollow" href="?q=Mageia-3-beta2-i586-DVD.iso"><?php _e('32bit');?></a><br>
+                            <a rel="nofollow" href="?q=Mageia-3-beta2-x86_64-DVD.iso"><?php _e('64bit');?></a></td>
+                        <td><a rel="nofollow" href="?q=Mageia-3-beta2-i586-DVD.iso&amp;torrent=1"><?php _e('32bit');?></a><br>
+                            <a rel="nofollow" href="?q=Mageia-3-beta2-x86_64-DVD.iso&amp;torrent=1"><?php _e('64bit');?></a></td>
                     </tr>
 <?php /*
                     <tr>
                         <th class="name"><?php _e('Installer CD')?><br>
                             <span class="dlinfo"><?php _e('100% Free Software')?></span></th>
                         <td class="size">700MB</td>
-                        <td><a rel="nofollow" href="?q=Mageia-3-beta1-dual-CD.iso"><?php _e('dualarch')?></a></td>
-                        <td><a rel="nofollow" href="?q=Mageia-3-beta1-dual-CD.iso&amp;torrent=1"><?php _e('dualarch')?></a></td>
+                        <td><a rel="nofollow" href="?q=Mageia-3-beta2-dual-CD.iso"><?php _e('dualarch')?></a></td>
+                        <td><a rel="nofollow" href="?q=Mageia-3-beta2-dual-CD.iso&amp;torrent=1"><?php _e('dualarch')?></a></td>
                     </tr>
 */ ?>
                     <tr><td colspan="4">
@@ -95,48 +95,48 @@ _lang_load($locale, '3');
                         <th class="name"><?php _e('LiveDVD KDE')?><br>
                             <span class="dlinfo"><?php _e('not suitable for upgrade')?></span></th>
                         <td class="size">1GB</td>
-                        <td><a rel="nofollow" href="?q=Mageia-3-beta1-LiveDVD-KDE4-i586-DVD.iso"><?php _e('32bit');?></a><br>
-                            <a rel="nofollow" href="?q=Mageia-3-beta1-LiveDVD-KDE4-x86_64-DVD.iso"><?php _e('64bit');?></a></td>
-                        <td><a rel="nofollow" href="?q=Mageia-3-beta1-LiveDVD-KDE4-i586-DVD.iso&amp;torrent=1"><?php _e('32bit');?></a><br>
-                            <a rel="nofollow" href="?q=Mageia-3-beta1-LiveDVD-KDE4-x86_64-DVD.iso&amp;torrent=1"><?php _e('64bit');?></a></td>
+                        <td><a rel="nofollow" href="?q=Mageia-3-beta2-LiveDVD-KDE4-i586-DVD.iso"><?php _e('32bit');?></a><br>
+                            <a rel="nofollow" href="?q=Mageia-3-beta2-LiveDVD-KDE4-x86_64-DVD.iso"><?php _e('64bit');?></a></td>
+                        <td><a rel="nofollow" href="?q=Mageia-3-beta2-LiveDVD-KDE4-i586-DVD.iso&amp;torrent=1"><?php _e('32bit');?></a><br>
+                            <a rel="nofollow" href="?q=Mageia-3-beta2-LiveDVD-KDE4-x86_64-DVD.iso&amp;torrent=1"><?php _e('64bit');?></a></td>
                     </tr>
                     <tr>
                         <th class="name"><?php _e('LiveDVD GNOME')?><br>
                             <span class="dlinfo"><?php _e('not suitable for upgrade')?></th>
                         <td class="size">1GB</td>
-                        <td><a rel="nofollow" href="?q=Mageia-3-beta1-LiveDVD-GNOME-i586-DVD.iso"><?php _e('32bit');?></a><br>
-                            <a rel="nofollow" href="?q=Mageia-3-beta1-LiveDVD-GNOME-x86_64-DVD.iso"><?php _e('64bit');?></a></td>
-                        <td><a rel="nofollow" href="?q=Mageia-3-beta1-LiveDVD-GNOME-i586-DVD.iso&amp;torrent=1"><?php _e('32bit');?></a><br>
-                            <a rel="nofollow" href="?q=Mageia-3-beta1-LiveDVD-GNOME-x86_64-DVD.iso&amp;torrent=1"><?php _e('64bit');?></a></td>
+                        <td><a rel="nofollow" href="?q=Mageia-3-beta2-LiveDVD-GNOME-i586-DVD.iso"><?php _e('32bit');?></a><br>
+                            <a rel="nofollow" href="?q=Mageia-3-beta2-LiveDVD-GNOME-x86_64-DVD.iso"><?php _e('64bit');?></a></td>
+                        <td><a rel="nofollow" href="?q=Mageia-3-beta2-LiveDVD-GNOME-i586-DVD.iso&amp;torrent=1"><?php _e('32bit');?></a><br>
+                            <a rel="nofollow" href="?q=Mageia-3-beta2-LiveDVD-GNOME-x86_64-DVD.iso&amp;torrent=1"><?php _e('64bit');?></a></td>
                     </tr>
                     <tr><td colspan="4">&nbsp;</td></tr>
                     <tr>
                         <th class="name"><?php _e('LiveCD KDE, English-only')?><br>
                             <span class="dlinfo"><?php _e('not suitable for upgrade')?></th>
                         <td class="size">640MB</td>
-                        <td><a rel="nofollow" href="?q=Mageia-3-beta1-LiveCD-KDE4-en-i586-CD.iso"><?php _e('32bit');?></a></td>
-                        <td><a rel="nofollow" href="?q=Mageia-3-beta1-LiveCD-KDE4-en-i586-CD.iso&amp;torrent=1"><?php _e('32bit');?></a><br>
+                        <td><a rel="nofollow" href="?q=Mageia-3-beta2-LiveCD-KDE4-en-i586-CD.iso"><?php _e('32bit');?></a></td>
+                        <td><a rel="nofollow" href="?q=Mageia-3-beta2-LiveCD-KDE4-en-i586-CD.iso&amp;torrent=1"><?php _e('32bit');?></a><br>
                     </tr>
                     <tr>
                         <th class="name"><?php _e('LiveCD GNOME, English-only')?><br>
                             <span class="dlinfo"><?php _e('not suitable for upgrade')?></th>
                         <td class="size">640MB</td>
-                        <td><a rel="nofollow" href="?q=Mageia-3-beta1-LiveCD-GNOME-en-i586-CD.iso"><?php _e('32bit');?></a></td>
-                        <td><a rel="nofollow" href="?q=Mageia-3-beta1-LiveCD-GNOME-en-i586-CD.iso&amp;torrent=1"><?php _e('32bit');?></a></td>
+                        <td><a rel="nofollow" href="?q=Mageia-3-beta2-LiveCD-GNOME-en-i586-CD.iso"><?php _e('32bit');?></a></td>
+                        <td><a rel="nofollow" href="?q=Mageia-3-beta2-LiveCD-GNOME-en-i586-CD.iso&amp;torrent=1"><?php _e('32bit');?></a></td>
                     </tr>
                     <tr><td colspan="3">&nbsp;</td></tr>
                     <tr>
                         <th><?php _e('Network installer, Free Software CD')?></th>
                         <td class="size">~20MB</td>
-                        <td><a rel="nofollow" href="?q=Mageia-3-beta1-Boot-i586-CD.iso"><?php _e('32bit');?></a><br>
-                            <a rel="nofollow" href="?q=Mageia-3-beta1-Boot-x86_64-CD.iso"><?php _e('64bit');?></a></td>
+                        <td><a rel="nofollow" href="?q=Mageia-3-beta2-Boot-i586-CD.iso"><?php _e('32bit');?></a><br>
+                            <a rel="nofollow" href="?q=Mageia-3-beta2-Boot-x86_64-CD.iso"><?php _e('64bit');?></a></td>
                     </tr>
                     <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">~25MB</td>
-                        <td><a rel="nofollow" href="?q=Mageia-3-beta1-Boot-nonfree-i586-CD.iso"><?php _e('32bit');?></a><br>
-                            <a rel="nofollow" href="?q=Mageia-3-beta1-Boot-nonfree-x86_64-CD.iso"><?php _e('64bit');?></a></td>
+                        <td><a rel="nofollow" href="?q=Mageia-3-beta2-Boot-nonfree-i586-CD.iso"><?php _e('32bit');?></a><br>
+                            <a rel="nofollow" href="?q=Mageia-3-beta2-Boot-nonfree-x86_64-CD.iso"><?php _e('64bit');?></a></td>
                     </tr>
                 </tbody>
                 </table>
diff --git a/en/downloads/get/definitions.ini b/en/downloads/get/definitions.ini
index 960dfa8e5..d61ca82c8 100644
--- a/en/downloads/get/definitions.ini
+++ b/en/downloads/get/definitions.ini
@@ -402,115 +402,115 @@ size = "3.5 GB"
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;; Mageia 3 beta1 (2012-11-14, rda, using fidd)
+;;;;; Mageia 3 beta2 (2013-01-26, leuhmanu commited by filip)
 ;;;;;;;;;;;;;;;;;;;;;
 
 ;
-[Mageia-3-beta1-Boot-i586-CD.iso]
+[Mageia-3-beta2-Boot-i586-CD.iso]
 file = boot.iso
 path = "distrib/cauldron/i586/install/images"
-name = "Mageia 3 beta1 Boot 32bit CD ISO"
+name = "Mageia 3 beta2 Boot 32bit CD ISO"
 
 ;
-[Mageia-3-beta1-Boot-x86_64-CD.iso]
+[Mageia-3-beta2-Boot-x86_64-CD.iso]
 file = boot.iso
 path = "distrib/cauldron/x86_64/install/images"
-name = "Mageia 3 beta1 Boot 64bit CD ISO"
+name = "Mageia 3 beta2 Boot 64bit CD ISO"
 
 ;
-[Mageia-3-beta1-Boot-nonfree-i586-CD.iso]
+[Mageia-3-beta2-Boot-nonfree-i586-CD.iso]
 file = boot-nonfree.iso
 path = "distrib/cauldron/i586/install/images"
-name = "Mageia 3 beta1 Boot Nonfree 32bit CD ISO"
+name = "Mageia 3 beta2 Boot Nonfree 32bit CD ISO"
 
 ;
-[Mageia-3-beta1-Boot-nonfree-x86_64-CD.iso]
+[Mageia-3-beta2-Boot-nonfree-x86_64-CD.iso]
 file = boot-nonfree.iso
 path = "distrib/cauldron/x86_64/install/images"
-name = "Mageia 3 beta1 Boot Nonfree 64bit CD ISO"
+name = "Mageia 3 beta2 Boot Nonfree 64bit CD ISO"
 
 ;
-[Mageia-3-beta1-LiveCD-GNOME-en-i586-CD.iso]
-file = "Mageia-3-beta1-LiveCD-GNOME-en-i586-CD.iso"
-md5 = "5ee6eac02579fe4153350c84a54756ed"
-sha1 = "2564c21b44835eaae1e3e371341134c28588dd93"
+[Mageia-3-beta2-LiveCD-GNOME-en-i586-CD.iso]
+file = "Mageia-3-beta2-LiveCD-GNOME-en-i586-CD.iso"
+md5 = "ddc5d6ef404e8e202fee90e2f0b85e4c"
+sha1 = "4bafd4114121e289c50ba88225848815ef74b224"
 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-3-beta1-LiveCD-GNOME-en-i586-CD"
-torrent = "iso/cauldron/torrents/Mageia-3-beta1-LiveCD-GNOME-en-i586-CD.torrent"
-name = "Mageia 3 beta1 LiveCD GNOME en 32bit CD"
-size = "662 MB"
- 
+path = "iso/cauldron/Mageia-3-beta2-LiveCD-GNOME-en-i586-CD"
+torrent = "iso/cauldron/torrents/Mageia-3-beta2-LiveCD-GNOME-en-i586-CD.torrent"
+name = "Mageia 3 beta2 LiveCD GNOME en 32bit CD"
+size = "673 MB"
+
 ;
-[Mageia-3-beta1-LiveCD-KDE4-en-i586-CD.iso]
-file = "Mageia-3-beta1-LiveCD-KDE4-en-i586-CD.iso"
-md5 = "249cda768f7f3a3a81bb5694fcc175e0"
-sha1 = "c1b9a439e71de496bf45545641edc93241311629"
+[Mageia-3-beta2-LiveCD-KDE4-en-i586-CD.iso]
+file = "Mageia-3-beta2-LiveCD-KDE4-en-i586-CD.iso"
+md5 = "7f4caaee6cd7fe7c8477ccb8fed489cc"
+sha1 = "082b9f551a749f7b4afc84903e6cc25843251b92"
 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-3-beta1-LiveCD-KDE4-en-i586-CD"
-torrent = "iso/cauldron/torrents/Mageia-3-beta1-LiveCD-KDE4-en-i586-CD.torrent"
-name = "Mageia 3 beta1 LiveCD KDE4 en 32bit CD"
-size = "678 MB"
+path = "iso/cauldron/Mageia-3-beta2-LiveCD-KDE4-en-i586-CD"
+torrent = "iso/cauldron/torrents/Mageia-3-beta2-LiveCD-KDE4-en-i586-CD.torrent"
+name = "Mageia 3 beta2 LiveCD KDE4 en 32bit CD"
+size = "677 MB"
  
 ;
-[Mageia-3-beta1-LiveDVD-GNOME-i586-DVD.iso]
-file = "Mageia-3-beta1-LiveDVD-GNOME-i586-DVD.iso"
-md5 = "ed162a5d22fb94225c8527d419552196"
-sha1 = "88a836dc31544be76aca85b50534cc5e1d1e0a4b"
+[Mageia-3-beta2-LiveDVD-GNOME-i586-DVD.iso]
+file = "Mageia-3-beta2-LiveDVD-GNOME-i586-DVD.iso"
+md5 = "abe531ffe62934ddac4bb2c47529ed6f"
+sha1 = "36ba594ea27f3a8173b91e6233ffd0b9d2207232"
 langs = "English (American) (en_US)"
-path = "iso/cauldron/Mageia-3-beta1-LiveDVD-GNOME-i586-DVD"
-torrent = "iso/cauldron/torrents/Mageia-3-beta1-LiveDVD-GNOME-i586-DVD.torrent"
-name = "Mageia 3 beta1 LiveDVD GNOME 32bit DVD"
-size = "1 GB"
- 
+path = "iso/cauldron/Mageia-3-beta2-LiveDVD-GNOME-i586-DVD"
+torrent = "iso/cauldron/torrents/Mageia-3-beta2-LiveDVD-GNOME-i586-DVD.torrent"
+name = "Mageia 3 beta2 LiveDVD GNOME 32bit DVD"
+size = "1.3 GB"
+
 ;
-[Mageia-3-beta1-LiveDVD-GNOME-x86_64-DVD.iso]
-file = "Mageia-3-beta1-LiveDVD-GNOME-x86_64-DVD.iso"
-md5 = "907deec9bfac84c44a54e00c3602a62c"
-sha1 = "8c6972686c36493afadc6a3a80218f471f9f81bc"
+[Mageia-3-beta2-LiveDVD-GNOME-x86_64-DVD.iso]
+file = "Mageia-3-beta2-LiveDVD-GNOME-x86_64-DVD.iso"
+md5 = "92b4e46d19e77df32e875027043c9af5"
+sha1 = "c9a90e5d64f6e883b0af302fedeec64270944a0e"
 langs = "English (American) (en_US)"
-path = "iso/cauldron/Mageia-3-beta1-LiveDVD-GNOME-x86_64-DVD"
-torrent = "iso/cauldron/torrents/Mageia-3-beta1-LiveDVD-GNOME-x86_64-DVD.torrent"
-name = "Mageia 3 beta1 LiveDVD GNOME 64bit DVD"
-size = "1.1 GB"
+path = "iso/cauldron/Mageia-3-beta2-LiveDVD-GNOME-x86_64-DVD"
+torrent = "iso/cauldron/torrents/Mageia-3-beta2-LiveDVD-GNOME-x86_64-DVD.torrent"
+name = "Mageia 3 beta2 LiveDVD GNOME 64bit DVD"
+size = "1.4 GB"
  
 ;
-[Mageia-3-beta1-LiveDVD-KDE4-i586-DVD.iso]
-file = "Mageia-3-beta1-LiveDVD-KDE4-i586-DVD.iso"
-md5 = "b3bb4de06fa9c9403853798568417c1a"
-sha1 = "d4ebc8a8eca6bcff875f2bbd3d64feefbe2c764d"
+[Mageia-3-beta2-LiveDVD-KDE4-i586-DVD.iso]
+file = "Mageia-3-beta2-LiveDVD-KDE4-i586-DVD.iso"
+md5 = "f75e8cd97dc6eeb4fc10983d513a84b5"
+sha1 = "af6171a367752282f5493beaf74418302cb39ef3"
 langs = "English (American) (en_US)"
-path = "iso/cauldron/Mageia-3-beta1-LiveDVD-KDE4-i586-DVD"
-torrent = "iso/cauldron/torrents/Mageia-3-beta1-LiveDVD-KDE4-i586-DVD.torrent"
-name = "Mageia 3 beta1 LiveDVD KDE4 32bit DVD"
-size = "1.1 GB"
- 
+path = "iso/cauldron/Mageia-3-beta2-LiveDVD-KDE4-i586-DVD"
+torrent = "iso/cauldron/torrents/Mageia-3-beta2-LiveDVD-KDE4-i586-DVD.torrent"
+name = "Mageia 3 beta2 LiveDVD KDE4 32bit DVD"
+size = "1.4 GB"
+
 ;
-[Mageia-3-beta1-LiveDVD-KDE4-x86_64-DVD.iso]
-file = "Mageia-3-beta1-LiveDVD-KDE4-x86_64-DVD.iso"
-md5 = "c663aeea86046abc5a50375c47132f7e"
-sha1 = "aff6068fdcff3203c10861d7c890c812d9525530"
+[Mageia-3-beta2-LiveDVD-KDE4-x86_64-DVD.iso]
+file = "Mageia-3-beta2-LiveDVD-KDE4-x86_64-DVD.iso"
+md5 = "92ab494006975b58cc1f195dee36787d"
+sha1 = "4835f94f7a995c4cb369a5d73c78bc518f23cbe2"
 langs = "English (American) (en_US)"
-path = "iso/cauldron/Mageia-3-beta1-LiveDVD-KDE4-x86_64-DVD"
-torrent = "iso/cauldron/torrents/Mageia-3-beta1-LiveDVD-KDE4-x86_64-DVD.torrent"
-name = "Mageia 3 beta1 LiveDVD KDE4 64bit DVD"
-size = "1.1 GB"
- 
-;
-[Mageia-3-beta1-i586-DVD.iso]
-file = "Mageia-3-beta1-i586-DVD.iso"
-md5 = "c0e2321bef3e9852ce63ac92f57ebc0c"
-sha1 = "53028750a23b0838122148601b696bb1bc52d21f"
-path = "iso/cauldron/Mageia-3-beta1-i586-DVD"
-torrent = "iso/cauldron/torrents/Mageia-3-beta1-i586-DVD.torrent"
-name = "Mageia 3 beta1 32bit DVD"
-size = "3.8 GB"
+path = "iso/cauldron/Mageia-3-beta2-LiveDVD-KDE4-x86_64-DVD"
+torrent = "iso/cauldron/torrents/Mageia-3-beta2-LiveDVD-KDE4-x86_64-DVD.torrent"
+name = "Mageia 3 beta2 LiveDVD KDE4 64bit DVD"
+size = "1.4 GB"
  
 ;
-[Mageia-3-beta1-x86_64-DVD.iso]
-file = "Mageia-3-beta1-x86_64-DVD.iso"
-md5 = "5288923401bb3a081402d2ddb107cda6"
-sha1 = "49fd8cbb2d2f78c471d6ddf6978cf91e43b745d7"
-path = "iso/cauldron/Mageia-3-beta1-x86_64-DVD"
-torrent = "iso/cauldron/torrents/Mageia-3-beta1-x86_64-DVD.torrent"
-name = "Mageia 3 beta1 64bit DVD"
-size = "3.7 GB"
+[Mageia-3-beta2-i586-DVD.iso]
+file = "Mageia-3-beta2-i586-DVD.iso"
+md5 = "d8e9dfa5d7f4741d1e55fd49754564fb"
+sha1 = "752a1a67a15ceaa8c3c28c8d724fd07b9a756224"
+path = "iso/cauldron/Mageia-3-beta2-i586-DVD"
+torrent = "iso/cauldron/torrents/Mageia-3-beta2-i586-DVD.torrent"
+name = "Mageia 3 beta2 32bit DVD"
+size = "3.9 GB"
+
+;
+[Mageia-3-beta2-x86_64-DVD.iso]
+file = "Mageia-3-beta2-x86_64-DVD.iso"
+md5 = "4fac433fe6ed90a487c875a8ed2a6740"
+sha1 = "6260c0311be8d1185e35bba72be28be79230c816"
+path = "iso/cauldron/Mageia-3-beta2-x86_64-DVD"
+torrent = "iso/cauldron/torrents/Mageia-3-beta2-x86_64-DVD.torrent"
+name = "Mageia 3 beta2 64bit DVD"
+size = "3.9 GB"