update cache lists

4 files changed, 382 insertions, 340 deletions

diff --git a/lib/Downloads.php b/lib/Downloads.php
index 85cff758b..b93736486 100644
--- a/lib/Downloads.php
+++ b/lib/Downloads.php
@@ -177,7 +177,7 @@ class Downloads
                     } else if ($mirrorlist) {
                         $test_file = $item['url'].'/distrib/6/x86_64/media/core/updates/repodata/repomd.xml';
                     } else {
-                        $test_file = $item['url'].'/iso/5/torrents/Mageia-5-LiveDVD-KDE4-x86_64-DVD.torrent';
+                        $test_file = $item['url'].'/iso/5.1/torrents/Mageia-5.1-x86_64-DVD.torrent';
                     }
                     if (false === @file_get_contents($test_file)) {
                         $num_dn++;
diff --git a/lib/cached.list.php b/lib/cached.list.php
index 7ba8ac749..82b8900ff 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -6,13 +6,6 @@
       'zone' => 'ZA',
       'country' => 'ZA',
       'city' => 'Stellenbosch',
-      'url' => 'ftp://ftp.sun.ac.za/pub/mirrors/mageia',
-    ),
-    1 => 
-    array (
-      'zone' => 'ZA',
-      'country' => 'ZA',
-      'city' => 'Stellenbosch',
       'url' => 'http://ftp.sun.ac.za/ftp/pub/mirrors/mageia',
     ),
   ),
@@ -23,86 +16,72 @@
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Beijing',
-      'url' => 'http://mirrors.tuna.tsinghua.edu.cn/mageia',
+      'url' => 'ftp://mirrors.yun-idc.com/mageia',
     ),
     1 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Beijing',
-      'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
+      'url' => 'http://mirrors.tuna.tsinghua.edu.cn/mageia',
     ),
     2 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'ftp://mirrors.ustc.edu.cn/mageia',
+      'city' => 'Beijing',
+      'url' => 'http://mirrors.yun-idc.com/mageia',
     ),
     3 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'http://mirrors.ustc.edu.cn/mageia',
+      'city' => 'Beijing',
+      'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
     ),
     4 => 
     array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'https://mirrors.ustc.edu.cn/mageia',
-    ),
-    5 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Shanghai',
-      'url' => 'https://ftp.sjtu.edu.cn/mageia',
-    ),
-    6 => 
-    array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    7 => 
+    5 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'ftp://mirror.rise.ph/mageia',
     ),
-    8 => 
+    6 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'http://mirror.rise.ph/mageia',
     ),
-    9 => 
+    7 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    10 => 
+    8 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    11 => 
+    9 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    12 => 
+    10 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -114,46 +93,46 @@
   array (
     0 => 
     array (
+      'zone' => 'BE',
+      'country' => 'BE',
+      'city' => 'Brussels',
+      'url' => 'ftp://ftp.belnet.be/mirror/mageia',
+    ),
+    1 => 
+    array (
+      'zone' => 'BE',
+      'country' => 'BE',
+      'city' => 'Brussels',
+      'url' => 'http://ftp.belnet.be/mageia',
+    ),
+    2 => 
+    array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'ftp://mirrors.netix.net/mageia',
     ),
-    1 => 
+    3 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'http://mirrors.netix.net/mageia',
     ),
-    2 => 
+    4 => 
     array (
       'zone' => 'BY',
       'country' => 'BY',
       'city' => 'Minsk',
       'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
-    3 => 
+    5 => 
     array (
       'zone' => 'BY',
       'country' => 'BY',
       'city' => 'Minsk',
       'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
-    4 => 
-    array (
-      'zone' => 'CH',
-      'country' => 'CH',
-      'city' => 'geneva',
-      'url' => 'http://mageia.unige.ch/mirror',
-    ),
-    5 => 
-    array (
-      'zone' => 'CZ',
-      'country' => 'CZ',
-      'city' => '?',
-      'url' => 'http://mageia.supp.name',
-    ),
     6 => 
     array (
       'zone' => 'CZ',
@@ -201,311 +180,360 @@
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Cologne',
-      'url' => 'http://mirror.netcologne.de/mageia',
+      'url' => 'ftp://mirror.netcologne.de/mageia',
     ),
     13 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
+      'city' => 'Cologne',
+      'url' => 'http://mirror.netcologne.de/mageia',
+    ),
+    14 => 
+    array (
+      'zone' => 'DE',
+      'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
     ),
-    14 => 
+    15 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
     ),
-    15 => 
+    16 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'https://ftp.uni-erlangen.de/mageia',
     ),
-    16 => 
+    17 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Esslingen',
       'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    17 => 
+    18 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Esslingen',
       'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    18 => 
+    19 => 
+    array (
+      'zone' => 'DE',
+      'country' => 'DE',
+      'city' => 'Falkenstein',
+      'url' => 'http://mirrors.cicku.me/mageia',
+    ),
+    20 => 
+    array (
+      'zone' => 'DE',
+      'country' => 'DE',
+      'city' => 'Falkenstein',
+      'url' => 'https://mirrors.cicku.me/mageia',
+    ),
+    21 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    19 => 
+    22 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    20 => 
+    23 => 
+    array (
+      'zone' => 'DE',
+      'country' => 'DE',
+      'city' => 'Hermsdorf',
+      'url' => 'ftp://mirror.tuxinator.org/mageia',
+    ),
+    24 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'freiburg',
       'url' => 'ftp://mirror2.tuxinator.org/mageia',
     ),
-    21 => 
+    25 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'freiburg',
       'url' => 'http://mirror2.tuxinator.org/mageia',
     ),
-    22 => 
+    26 => 
+    array (
+      'zone' => 'DK',
+      'country' => 'DK',
+      'city' => 'DTU',
+      'url' => 'ftp://ftp.klid.dk/mageia',
+    ),
+    27 => 
+    array (
+      'zone' => 'DK',
+      'country' => 'DK',
+      'city' => 'DTU',
+      'url' => 'http://ftp.klid.dk/ftp/mageia',
+    ),
+    28 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
     ),
-    23 => 
+    29 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    24 => 
+    30 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    25 => 
+    31 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
     ),
-    26 => 
+    32 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    27 => 
+    33 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    28 => 
+    34 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://ftp.free.fr/mirrors/mageia.org',
     ),
-    29 => 
+    35 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    30 => 
+    36 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    31 => 
+    37 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    32 => 
+    38 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    33 => 
+    39 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    34 => 
+    40 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    35 => 
+    41 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    36 => 
+    42 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    37 => 
+    43 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    38 => 
+    44 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    39 => 
+    45 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    40 => 
+    46 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    41 => 
+    47 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    42 => 
+    48 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    43 => 
+    49 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    44 => 
+    50 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    45 => 
+    51 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    46 => 
+    52 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    47 => 
-    array (
-      'zone' => 'UA',
-      'country' => 'UA',
-      'city' => 'Vinnytsia',
-      'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
-    ),
-    48 => 
-    array (
-      'zone' => 'UA',
-      'country' => 'UA',
-      'city' => 'Vinnytsia',
-      'url' => 'http://mageia.ip-connect.vn.ua',
-    ),
   ),
   '_C:NA' => 
   array (
+    0 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => '?',
+      'url' => 'http://mirrors.kernel.org/mageia',
+    ),
     1 => 
     array (
-      'zone' => 'CA',
-      'country' => 'CA',
-      'city' => 'Toronto',
-      'url' => 'ftp://mageia.webconquest.com',
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'Durham',
+      'url' => 'http://distro.ibiblio.org/pub/linux/distributions/mageia',
     ),
     2 => 
     array (
-      'zone' => 'CA',
-      'country' => 'CA',
-      'city' => 'Toronto',
-      'url' => 'http://mageia.webconquest.com',
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'Lenoir',
+      'url' => 'http://mirror.dacentec.com/mageia',
     ),
     3 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => '?',
-      'url' => 'http://mirrors.kernel.org/mageia',
+      'city' => 'Princeton',
+      'url' => 'http://mirror.math.princeton.edu/pub/mageia',
     ),
     4 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Fremont',
-      'url' => 'http://mirror.easthsia.com/mageia',
+      'city' => 'Southfeild',
+      'url' => 'ftp://mirror.nexcess.net/mageia',
     ),
     5 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Lenoir',
-      'url' => 'http://mirror.dacentec.com/mageia',
+      'city' => 'Southfeild',
+      'url' => 'http://mirror.nexcess.net/mageia',
     ),
     6 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Southfeild',
-      'url' => 'ftp://mirror.nexcess.net/mageia',
+      'city' => 'glen allen',
+      'url' => 'ftp://mageia.jameswhitby.net/mageia',
     ),
     7 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Southfeild',
-      'url' => 'http://mirror.nexcess.net/mageia',
+      'city' => 'glen allen',
+      'url' => 'http://mageia.jameswhitby.net/mageia',
+    ),
+    8 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'lansing',
+      'url' => 'ftp://mirrors-usa.go-parts.com/mageia',
+    ),
+    9 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'lansing',
+      'url' => 'http://mirrors-usa.go-parts.com/mageia',
     ),
   ),
   '_C:SA' => 
@@ -540,19 +568,12 @@
     ),
     4 => 
     array (
-      'zone' => 'BR',
-      'country' => 'BR',
-      'city' => 'Campinas',
-      'url' => 'http://ftp.las.ic.unicamp.br/pub/mageia',
-    ),
-    5 => 
-    array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'ftp://mirror.cedia.org.ec/mageia',
     ),
-    6 => 
+    5 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
diff --git a/lib/cached.list_doc.php b/lib/cached.list_doc.php
index 03a3c3023..9134f88f9 100644
--- a/lib/cached.list_doc.php
+++ b/lib/cached.list_doc.php
@@ -6,13 +6,6 @@
       'zone' => 'ZA',
       'country' => 'ZA',
       'city' => 'Stellenbosch',
-      'url' => 'ftp://ftp.sun.ac.za/pub/mirrors/mageia',
-    ),
-    1 => 
-    array (
-      'zone' => 'ZA',
-      'country' => 'ZA',
-      'city' => 'Stellenbosch',
       'url' => 'http://ftp.sun.ac.za/ftp/pub/mirrors/mageia',
     ),
   ),
@@ -37,121 +30,93 @@
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Beijing',
-      'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
+      'url' => 'http://mirrors.yun-idc.com/mageia',
     ),
     3 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'ftp://mirrors.ustc.edu.cn/mageia',
+      'city' => 'Beijing',
+      'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
     ),
     4 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'http://mirrors.ustc.edu.cn/mageia',
-    ),
-    5 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'https://mirrors.ustc.edu.cn/mageia',
-    ),
-    6 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'http://ftp.sjtu.edu.cn/mageia',
     ),
-    7 => 
+    5 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'https://ftp.sjtu.edu.cn/mageia',
     ),
-    8 => 
+    6 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    9 => 
+    7 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'ftp://mirror.rise.ph/mageia',
     ),
-    10 => 
+    8 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'http://mirror.rise.ph/mageia',
     ),
-    11 => 
+    9 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    12 => 
+    10 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    13 => 
+    11 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    14 => 
+    12 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'http://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    15 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'ftp://free.nchc.org.tw/mageia',
-    ),
-    16 => 
+    13 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    17 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'http://free.nchc.org.tw/mageia',
-    ),
-    18 => 
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    19 => 
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -264,268 +229,296 @@
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Cologne',
-      'url' => 'http://mirror.netcologne.de/mageia',
+      'url' => 'ftp://mirror.netcologne.de/mageia',
     ),
     15 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
+      'city' => 'Cologne',
+      'url' => 'http://mirror.netcologne.de/mageia',
+    ),
+    16 => 
+    array (
+      'zone' => 'DE',
+      'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
     ),
-    16 => 
+    17 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
     ),
-    17 => 
+    18 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'https://ftp.uni-erlangen.de/mageia',
     ),
-    18 => 
+    19 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Esslingen',
       'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    19 => 
+    20 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Esslingen',
       'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    20 => 
+    21 => 
+    array (
+      'zone' => 'DE',
+      'country' => 'DE',
+      'city' => 'Falkenstein',
+      'url' => 'http://mirrors.cicku.me/mageia',
+    ),
+    22 => 
+    array (
+      'zone' => 'DE',
+      'country' => 'DE',
+      'city' => 'Falkenstein',
+      'url' => 'https://mirrors.cicku.me/mageia',
+    ),
+    23 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    21 => 
+    24 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    22 => 
+    25 => 
+    array (
+      'zone' => 'DE',
+      'country' => 'DE',
+      'city' => 'Hermsdorf',
+      'url' => 'ftp://mirror.tuxinator.org/mageia',
+    ),
+    26 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'freiburg',
       'url' => 'ftp://mirror2.tuxinator.org/mageia',
     ),
-    23 => 
+    27 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'freiburg',
       'url' => 'http://mirror2.tuxinator.org/mageia',
     ),
-    24 => 
+    28 => 
     array (
       'zone' => 'DK',
       'country' => 'DK',
       'city' => 'DTU',
       'url' => 'ftp://ftp.klid.dk/mageia',
     ),
-    25 => 
+    29 => 
     array (
       'zone' => 'DK',
       'country' => 'DK',
       'city' => 'DTU',
       'url' => 'http://ftp.klid.dk/ftp/mageia',
     ),
-    26 => 
+    30 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
     ),
-    27 => 
+    31 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    28 => 
+    32 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    29 => 
+    33 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
     ),
-    30 => 
+    34 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    31 => 
+    35 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    32 => 
+    36 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://ftp.free.fr/mirrors/mageia.org',
     ),
-    33 => 
+    37 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    34 => 
+    38 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    35 => 
+    39 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    36 => 
+    40 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    37 => 
+    41 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    38 => 
+    42 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    39 => 
+    43 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    40 => 
+    44 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    41 => 
+    45 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    42 => 
+    46 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    43 => 
+    47 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    44 => 
+    48 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    45 => 
+    49 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    46 => 
+    50 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    47 => 
+    51 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    48 => 
+    52 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    49 => 
+    53 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    50 => 
+    54 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    51 => 
+    55 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    52 => 
+    56 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -535,54 +528,68 @@
   ),
   '_C:NA' => 
   array (
-    1 => 
+    0 => 
     array (
       'zone' => 'CA',
       'country' => 'CA',
       'city' => 'Toronto',
       'url' => 'ftp://mageia.webconquest.com',
     ),
-    2 => 
+    1 => 
     array (
       'zone' => 'CA',
       'country' => 'CA',
       'city' => 'Toronto',
       'url' => 'http://mageia.webconquest.com',
     ),
-    3 => 
+    2 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => '?',
       'url' => 'http://mirrors.kernel.org/mageia',
     ),
+    3 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'Lenoir',
+      'url' => 'http://mirror.dacentec.com/mageia',
+    ),
     4 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Fremont',
-      'url' => 'http://mirror.easthsia.com/mageia',
+      'city' => 'Princeton',
+      'url' => 'http://mirror.math.princeton.edu/pub/mageia',
     ),
     5 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Lenoir',
-      'url' => 'http://mirror.dacentec.com/mageia',
+      'city' => 'Southfeild',
+      'url' => 'ftp://mirror.nexcess.net/mageia',
     ),
     6 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Southfeild',
-      'url' => 'ftp://mirror.nexcess.net/mageia',
+      'url' => 'http://mirror.nexcess.net/mageia',
     ),
     7 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Southfeild',
-      'url' => 'http://mirror.nexcess.net/mageia',
+      'city' => 'glen allen',
+      'url' => 'ftp://mageia.jameswhitby.net/mageia',
+    ),
+    8 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'glen allen',
+      'url' => 'http://mageia.jameswhitby.net/mageia',
     ),
   ),
   '_C:OC' => 
@@ -634,19 +641,12 @@
     ),
     4 => 
     array (
-      'zone' => 'BR',
-      'country' => 'BR',
-      'city' => 'Campinas',
-      'url' => 'http://ftp.las.ic.unicamp.br/pub/mageia',
-    ),
-    5 => 
-    array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'ftp://mirror.cedia.org.ec/mageia',
     ),
-    6 => 
+    5 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
diff --git a/lib/cached.list_mirrorlist.php b/lib/cached.list_mirrorlist.php
index 48330c419..b568585f2 100644
--- a/lib/cached.list_mirrorlist.php
+++ b/lib/cached.list_mirrorlist.php
@@ -6,13 +6,6 @@
       'zone' => 'ZA',
       'country' => 'ZA',
       'city' => 'Stellenbosch',
-      'url' => 'ftp://ftp.sun.ac.za/pub/mirrors/mageia',
-    ),
-    1 => 
-    array (
-      'zone' => 'ZA',
-      'country' => 'ZA',
-      'city' => 'Stellenbosch',
       'url' => 'http://ftp.sun.ac.za/ftp/pub/mirrors/mageia',
     ),
   ),
@@ -37,121 +30,93 @@
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Beijing',
-      'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
+      'url' => 'http://mirrors.yun-idc.com/mageia',
     ),
     3 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'ftp://mirrors.ustc.edu.cn/mageia',
+      'city' => 'Beijing',
+      'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
     ),
     4 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'http://mirrors.ustc.edu.cn/mageia',
-    ),
-    5 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'https://mirrors.ustc.edu.cn/mageia',
-    ),
-    6 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'http://ftp.sjtu.edu.cn/mageia',
     ),
-    7 => 
+    5 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'https://ftp.sjtu.edu.cn/mageia',
     ),
-    8 => 
+    6 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    9 => 
+    7 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'ftp://mirror.rise.ph/mageia',
     ),
-    10 => 
+    8 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'http://mirror.rise.ph/mageia',
     ),
-    11 => 
+    9 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    12 => 
+    10 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    13 => 
+    11 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    14 => 
+    12 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'http://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    15 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'ftp://free.nchc.org.tw/mageia',
-    ),
-    16 => 
+    13 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    17 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'http://free.nchc.org.tw/mageia',
-    ),
-    18 => 
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    19 => 
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -205,299 +170,334 @@
     ),
     6 => 
     array (
+      'zone' => 'CH',
+      'country' => 'CH',
+      'city' => 'geneva',
+      'url' => 'http://mageia.unige.ch/mirror',
+    ),
+    7 => 
+    array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => '?',
       'url' => 'http://mageia.supp.name',
     ),
-    7 => 
+    8 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    8 => 
+    9 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    9 => 
+    10 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => '?',
       'url' => 'ftp://srv3.tuxinator.org/mageia',
     ),
-    10 => 
+    11 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => '?',
       'url' => 'ftp://srv4.tuxinator.org/mageia',
     ),
-    11 => 
+    12 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => '?',
       'url' => 'http://srv3.tuxinator.org/mageia',
     ),
-    12 => 
+    13 => 
+    array (
+      'zone' => 'DE',
+      'country' => 'DE',
+      'city' => 'Cologne',
+      'url' => 'ftp://mirror.netcologne.de/mageia',
+    ),
+    14 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Cologne',
       'url' => 'http://mirror.netcologne.de/mageia',
     ),
-    13 => 
+    15 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
     ),
-    14 => 
+    16 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
     ),
-    15 => 
+    17 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'https://ftp.uni-erlangen.de/mageia',
     ),
-    16 => 
+    18 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Esslingen',
       'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    17 => 
+    19 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Esslingen',
       'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    18 => 
+    20 => 
+    array (
+      'zone' => 'DE',
+      'country' => 'DE',
+      'city' => 'Falkenstein',
+      'url' => 'http://mirrors.cicku.me/mageia',
+    ),
+    21 => 
+    array (
+      'zone' => 'DE',
+      'country' => 'DE',
+      'city' => 'Falkenstein',
+      'url' => 'https://mirrors.cicku.me/mageia',
+    ),
+    22 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    19 => 
+    23 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    20 => 
+    24 => 
+    array (
+      'zone' => 'DE',
+      'country' => 'DE',
+      'city' => 'Hermsdorf',
+      'url' => 'ftp://mirror.tuxinator.org/mageia',
+    ),
+    25 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'freiburg',
       'url' => 'ftp://mirror2.tuxinator.org/mageia',
     ),
-    21 => 
+    26 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'freiburg',
       'url' => 'http://mirror2.tuxinator.org/mageia',
     ),
-    22 => 
+    27 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
     ),
-    23 => 
+    28 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    24 => 
+    29 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    25 => 
+    30 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
     ),
-    26 => 
+    31 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    27 => 
+    32 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    28 => 
+    33 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://ftp.free.fr/mirrors/mageia.org',
     ),
-    29 => 
+    34 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    30 => 
+    35 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    31 => 
+    36 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    32 => 
+    37 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    33 => 
+    38 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    34 => 
+    39 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    35 => 
+    40 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    36 => 
+    41 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    37 => 
+    42 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    38 => 
+    43 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    39 => 
+    44 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    40 => 
+    45 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    41 => 
+    46 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    42 => 
+    47 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    43 => 
+    48 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    44 => 
+    49 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    45 => 
+    50 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    46 => 
+    51 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    47 => 
+    52 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    48 => 
+    53 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -507,61 +507,89 @@
   ),
   '_C:NA' => 
   array (
-    1 => 
+    0 => 
     array (
       'zone' => 'CA',
       'country' => 'CA',
       'city' => 'Toronto',
       'url' => 'ftp://mageia.webconquest.com',
     ),
-    2 => 
+    1 => 
     array (
       'zone' => 'CA',
       'country' => 'CA',
       'city' => 'Toronto',
       'url' => 'http://mageia.webconquest.com',
     ),
-    3 => 
+    2 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => '?',
       'url' => 'http://mirrors.kernel.org/mageia',
     ),
-    4 => 
+    3 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Durham',
       'url' => 'http://distro.ibiblio.org/pub/linux/distributions/mageia',
     ),
+    4 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'Lenoir',
+      'url' => 'http://mirror.dacentec.com/mageia',
+    ),
     5 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Fremont',
-      'url' => 'http://mirror.easthsia.com/mageia',
+      'city' => 'Princeton',
+      'url' => 'http://mirror.math.princeton.edu/pub/mageia',
     ),
     6 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Lenoir',
-      'url' => 'http://mirror.dacentec.com/mageia',
+      'city' => 'Southfeild',
+      'url' => 'ftp://mirror.nexcess.net/mageia',
     ),
     7 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Southfeild',
-      'url' => 'ftp://mirror.nexcess.net/mageia',
+      'url' => 'http://mirror.nexcess.net/mageia',
     ),
     8 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Southfeild',
-      'url' => 'http://mirror.nexcess.net/mageia',
+      'city' => 'glen allen',
+      'url' => 'ftp://mageia.jameswhitby.net/mageia',
+    ),
+    9 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'glen allen',
+      'url' => 'http://mageia.jameswhitby.net/mageia',
+    ),
+    10 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'lansing',
+      'url' => 'ftp://mirrors-usa.go-parts.com/mageia',
+    ),
+    11 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'lansing',
+      'url' => 'http://mirrors-usa.go-parts.com/mageia',
     ),
   ),
   '_C:OC' => 
@@ -613,19 +641,12 @@
     ),
     4 => 
     array (
-      'zone' => 'BR',
-      'country' => 'BR',
-      'city' => 'Campinas',
-      'url' => 'http://ftp.las.ic.unicamp.br/pub/mageia',
-    ),
-    5 => 
-    array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'ftp://mirror.cedia.org.ec/mageia',
     ),
-    6 => 
+    5 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',