mirrors cached list update

1 files changed, 485 insertions, 558 deletions

diff --git a/lib/cached.list.php b/lib/cached.list.php
index 61d4a6ad6..b7ae24fa2 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -1,217 +1,106 @@
 <?php $mirrors = array (
-  'US' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Kansas City',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirror.9nav.com/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Southfeild',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirror.nexcess.net/mageia',
-    ),
-    2 => 
-    array (
-      'city' => 'Southfeild',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'ftp://mirror.nexcess.net/mageia',
-    ),
-    3 => 
-    array (
-      'city' => '?',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'ftp://mirrors.kernel.org/mageia',
-    ),
-    4 => 
-    array (
-      'city' => '?',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirrors.kernel.org/mageia',
-    ),
-    5 => 
-    array (
-      'city' => 'Lenoir',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirror.dacentec.com/mageia',
-    ),
-  ),
-  '_C:NA' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Kansas City',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirror.9nav.com/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Southfeild',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirror.nexcess.net/mageia',
-    ),
-    2 => 
-    array (
-      'city' => 'Toronto',
-      'continent' => 'NA',
-      'zone' => 'CA',
-      'url' => 'ftp://mageia.webconquest.com',
-    ),
-    3 => 
-    array (
-      'city' => 'Southfeild',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'ftp://mirror.nexcess.net/mageia',
-    ),
-    4 => 
-    array (
-      'city' => '?',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'ftp://mirrors.kernel.org/mageia',
-    ),
-    5 => 
-    array (
-      'city' => 'Toronto',
-      'continent' => 'NA',
-      'zone' => 'CA',
-      'url' => 'http://mageia.webconquest.com',
-    ),
-    6 => 
-    array (
-      'city' => '?',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirrors.kernel.org/mageia',
-    ),
-    7 => 
-    array (
-      'city' => 'Lenoir',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirror.dacentec.com/mageia',
-    ),
-  ),
-  'NL' => 
+  'GR' => 
   array (
     0 => 
     array (
-      'city' => 'Enschede',
+      'city' => 'Heraklion',
       'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
+      'zone' => 'GR',
+      'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
     1 => 
     array (
-      'city' => 'Enschede',
-      'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
-    ),
-    2 => 
-    array (
-      'city' => 'Amsterdam',
+      'city' => 'Heraklion',
       'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+      'zone' => 'GR',
+      'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
   ),
   '_C:EU' => 
   array (
     0 => 
     array (
-      'city' => 'Enschede',
+      'city' => 'Heraklion',
       'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
+      'zone' => 'GR',
+      'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
     1 => 
     array (
-      'city' => 'Heraklion',
+      'city' => 'Cologne',
       'continent' => 'EU',
-      'zone' => 'GR',
-      'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
+      'zone' => 'DE',
+      'url' => 'http://mirror.netcologne.de/mageia',
     ),
     2 => 
     array (
-      'city' => 'geneva',
+      'city' => '?',
       'continent' => 'EU',
-      'zone' => 'CH',
-      'url' => 'http://mageia.unige.ch/mirror',
+      'zone' => 'DE',
+      'url' => 'ftp://mirror2.tuxinator.org/mageia',
     ),
     3 => 
     array (
-      'city' => 'Esslingen',
+      'city' => 'Göttingen',
       'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
+      'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
     4 => 
     array (
-      'city' => 'Prague',
+      'city' => 'Umeå',
       'continent' => 'EU',
-      'zone' => 'CZ',
-      'url' => 'http://mageia.mirror.dkm.cz/pub/mageia',
+      'zone' => 'SE',
+      'url' => 'ftp://ftp.acc.umu.se/mirror/mageia',
     ),
     5 => 
     array (
-      'city' => '?',
+      'city' => 'Prague',
       'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://mirror2.tuxinator.org/mageia',
+      'zone' => 'CZ',
+      'url' => 'ftp://mageia.mirror.dkm.cz/pub/mageia',
     ),
     6 => 
     array (
-      'city' => 'Prague',
+      'city' => 'Esslingen',
       'continent' => 'EU',
-      'zone' => 'CZ',
-      'url' => 'ftp://mageia.mirror.dkm.cz/pub/mageia',
+      'zone' => 'DE',
+      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
     7 => 
     array (
-      'city' => 'Umeå',
+      'city' => 'Heraklion',
       'continent' => 'EU',
-      'zone' => 'SE',
-      'url' => 'ftp://ftp.acc.umu.se/mirror/mageia',
+      'zone' => 'GR',
+      'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
     8 => 
     array (
-      'city' => 'Sofia',
+      'city' => 'geneva',
       'continent' => 'EU',
-      'zone' => 'BG',
-      'url' => 'http://mandriva.cointech.net/pub/Mageia',
+      'zone' => 'CH',
+      'url' => 'http://mageia.unige.ch/mirror',
     ),
     9 => 
     array (
-      'city' => 'Cologne',
+      'city' => 'Prague',
       'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://mirror.netcologne.de/mageia',
+      'zone' => 'CZ',
+      'url' => 'http://mageia.mirror.dkm.cz/pub/mageia',
     ),
     10 => 
     array (
       'city' => 'Enschede',
       'continent' => 'EU',
       'zone' => 'NL',
-      'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
+      'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
     11 => 
     array (
-      'city' => 'Göttingen',
+      'city' => 'Enschede',
       'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
+      'zone' => 'NL',
+      'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
     12 => 
     array (
@@ -222,215 +111,288 @@
     ),
     13 => 
     array (
-      'city' => 'Heraklion',
+      'city' => 'Sofia',
       'continent' => 'EU',
-      'zone' => 'GR',
-      'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
+      'zone' => 'BG',
+      'url' => 'http://mandriva.cointech.net/pub/Mageia',
     ),
     14 => 
     array (
-      'city' => 'Brno',
+      'city' => 'Esslingen',
       'continent' => 'EU',
-      'zone' => 'CZ',
-      'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
+      'zone' => 'DE',
+      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
     15 => 
     array (
-      'city' => 'Roma',
+      'city' => 'Uppsala',
       'continent' => 'EU',
-      'zone' => 'IT',
-      'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
+      'zone' => 'SE',
+      'url' => 'http://ftp.sunet.se/pub/Linux/distributions/mageia',
     ),
     16 => 
     array (
-      'city' => 'Paris',
+      'city' => 'Canterbury',
       'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+      'zone' => 'GB',
+      'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
     17 => 
     array (
-      'city' => 'Moscow',
+      'city' => 'Hermsdorf',
       'continent' => 'EU',
-      'zone' => 'RU',
-      'url' => 'http://mirror.yandex.ru/mageia',
+      'zone' => 'DE',
+      'url' => 'ftp://mirror.tuxinator.org/mageia',
     ),
     18 => 
     array (
-      'city' => 'Uppsala',
+      'city' => 'Paris',
       'continent' => 'EU',
-      'zone' => 'SE',
-      'url' => 'http://ftp.sunet.se/pub/Linux/distributions/mageia',
+      'zone' => 'FR',
+      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
     19 => 
     array (
-      'city' => 'Lucern',
+      'city' => 'Brno',
       'continent' => 'EU',
-      'zone' => 'CH',
-      'url' => 'ftp://ftp.LinuxCabal.org/pub/mirrors/Mageia',
+      'zone' => 'CZ',
+      'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
     ),
     20 => 
     array (
-      'city' => 'Cologne',
+      'city' => 'Milan',
       'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://mirror.netcologne.de/mageia',
+      'zone' => 'IT',
+      'url' => 'http://vodka.sublink.org/mageia',
     ),
     21 => 
     array (
-      'city' => 'Lyon',
+      'city' => 'Brussels',
       'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'http://fr2.rpmfind.net/linux/mageia',
+      'zone' => 'BE',
+      'url' => 'http://ftp.belnet.be/mageia',
     ),
     22 => 
     array (
-      'city' => 'Erlangen',
+      'city' => 'Hermsdorf',
       'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
+      'url' => 'http://mirror.tuxinator.org/mageia',
     ),
     23 => 
     array (
-      'city' => 'Canterbury',
-      'continent' => 'EU',
-      'zone' => 'GB',
-      'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
-    ),
-    24 => 
-    array (
       'city' => 'Umeå',
       'continent' => 'EU',
       'zone' => 'SE',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    25 => 
+    24 => 
     array (
-      'city' => 'Brussels',
+      'city' => 'Amsterdam',
       'continent' => 'EU',
-      'zone' => 'BE',
-      'url' => 'http://ftp.belnet.be/mageia',
+      'zone' => 'NL',
+      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    26 => 
+    25 => 
     array (
       'city' => 'Roma',
       'continent' => 'EU',
       'zone' => 'IT',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
+    26 => 
+    array (
+      'city' => 'Cologne',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'ftp://mirror.netcologne.de/mageia',
+    ),
     27 => 
     array (
-      'city' => 'Uppsala',
+      'city' => 'Moscow',
       'continent' => 'EU',
-      'zone' => 'SE',
-      'url' => 'ftp://ftp.sunet.se/pub/Linux/distributions/mageia',
+      'zone' => 'RU',
+      'url' => 'http://mirror.yandex.ru/mageia',
     ),
     28 => 
     array (
-      'city' => 'Hermsdorf',
+      'city' => 'Roma',
       'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://mirror.tuxinator.org/mageia',
+      'zone' => 'IT',
+      'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
     ),
     29 => 
     array (
-      'city' => 'Esslingen',
+      'city' => 'Lucern',
       'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
+      'zone' => 'CH',
+      'url' => 'ftp://ftp.LinuxCabal.org/pub/mirrors/Mageia',
     ),
     30 => 
     array (
-      'city' => 'Milan',
+      'city' => 'Uppsala',
       'continent' => 'EU',
-      'zone' => 'IT',
-      'url' => 'http://vodka.sublink.org/mageia',
+      'zone' => 'SE',
+      'url' => 'ftp://ftp.sunet.se/pub/Linux/distributions/mageia',
     ),
     31 => 
     array (
-      'city' => 'Amsterdam',
+      'city' => 'Erlangen',
       'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+      'zone' => 'DE',
+      'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
     ),
     32 => 
     array (
-      'city' => 'Hermsdorf',
+      'city' => 'Canterbury',
       'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://mirror.tuxinator.org/mageia',
+      'zone' => 'GB',
+      'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
     33 => 
     array (
-      'city' => 'Canterbury',
+      'city' => 'Brno',
       'continent' => 'EU',
-      'zone' => 'GB',
-      'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
+      'zone' => 'CZ',
+      'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
     ),
     34 => 
     array (
-      'city' => 'Lyon',
+      'city' => 'Minsk',
       'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
+      'zone' => 'BY',
+      'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
     35 => 
     array (
-      'city' => 'Brno',
+      'city' => 'Paris',
       'continent' => 'EU',
-      'zone' => 'CZ',
-      'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
+      'zone' => 'FR',
+      'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
     36 => 
     array (
-      'city' => 'Minsk',
+      'city' => 'Erlangen',
       'continent' => 'EU',
-      'zone' => 'BY',
-      'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org',
+      'zone' => 'DE',
+      'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
     ),
     37 => 
     array (
-      'city' => 'Milan',
+      'city' => '?',
       'continent' => 'EU',
-      'zone' => 'IT',
-      'url' => 'ftp://vodka.sublink.org/mageia',
+      'zone' => 'DE',
+      'url' => 'http://mirror2.tuxinator.org/mageia',
     ),
     38 => 
     array (
-      'city' => 'Erlangen',
+      'city' => 'Milan',
       'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
+      'zone' => 'IT',
+      'url' => 'ftp://vodka.sublink.org/mageia',
     ),
     39 => 
     array (
-      'city' => 'Paris',
+      'city' => 'Minsk',
       'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+      'zone' => 'BY',
+      'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
     40 => 
     array (
+      'city' => '?',
+      'continent' => 'EU',
+      'zone' => 'CZ',
+      'url' => 'http://mageia.supp.name',
+    ),
+    41 => 
+    array (
       'city' => 'Moscow',
       'continent' => 'EU',
       'zone' => 'RU',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    41 => 
+  ),
+  'DE' => 
+  array (
+    0 => 
+    array (
+      'city' => 'Cologne',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'http://mirror.netcologne.de/mageia',
+    ),
+    1 => 
     array (
       'city' => '?',
       'continent' => 'EU',
-      'zone' => 'CZ',
-      'url' => 'http://mageia.supp.name',
+      'zone' => 'DE',
+      'url' => 'ftp://mirror2.tuxinator.org/mageia',
     ),
-    42 => 
+    2 => 
     array (
-      'city' => 'Minsk',
+      'city' => 'Göttingen',
       'continent' => 'EU',
-      'zone' => 'BY',
-      'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
+      'zone' => 'DE',
+      'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
+    ),
+    3 => 
+    array (
+      'city' => 'Esslingen',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    43 => 
+    4 => 
+    array (
+      'city' => 'Göttingen',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
+    ),
+    5 => 
+    array (
+      'city' => 'Esslingen',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
+    ),
+    6 => 
+    array (
+      'city' => 'Hermsdorf',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'ftp://mirror.tuxinator.org/mageia',
+    ),
+    7 => 
+    array (
+      'city' => 'Hermsdorf',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'http://mirror.tuxinator.org/mageia',
+    ),
+    8 => 
+    array (
+      'city' => 'Cologne',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'ftp://mirror.netcologne.de/mageia',
+    ),
+    9 => 
+    array (
+      'city' => 'Erlangen',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
+    ),
+    10 => 
+    array (
+      'city' => 'Erlangen',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
+    ),
+    11 => 
     array (
       'city' => '?',
       'continent' => 'EU',
@@ -445,14 +407,14 @@
       'city' => 'Ankara',
       'continent' => 'AS',
       'zone' => 'TR',
-      'url' => 'http://ftp.linux.org.tr/mageia',
+      'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
     1 => 
     array (
       'city' => 'Ankara',
       'continent' => 'AS',
       'zone' => 'TR',
-      'url' => 'ftp://ftp.linux.org.tr/mageia',
+      'url' => 'http://ftp.linux.org.tr/mageia',
     ),
   ),
   '_C:AS' => 
@@ -462,263 +424,167 @@
       'city' => 'Ankara',
       'continent' => 'AS',
       'zone' => 'TR',
-      'url' => 'http://ftp.linux.org.tr/mageia',
+      'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
     1 => 
     array (
-      'city' => 'Ankara',
+      'city' => 'HsinChu',
       'continent' => 'AS',
-      'zone' => 'TR',
-      'url' => 'ftp://ftp.linux.org.tr/mageia',
+      'zone' => 'TW',
+      'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
     2 => 
     array (
-      'city' => 'Beijing',
+      'city' => 'HsinChu',
       'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'http://mirrors.yun-idc.com/mageia',
+      'zone' => 'TW',
+      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
     3 => 
     array (
-      'city' => 'HsinChu',
+      'city' => 'Ankara',
       'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
+      'zone' => 'TR',
+      'url' => 'http://ftp.linux.org.tr/mageia',
     ),
     4 => 
     array (
-      'city' => 'HsinChu',
+      'city' => 'Beijing',
       'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'http://free.nchc.org.tw/mageia',
+      'zone' => 'CN',
+      'url' => 'http://mirrors.yun-idc.com/mageia',
     ),
     5 => 
     array (
-      'city' => '石川',
+      'city' => 'Taipei',
       'continent' => 'AS',
-      'zone' => 'JP',
-      'url' => 'http://ftp.jaist.ac.jp/pub/Linux/Mageia',
+      'zone' => 'TW',
+      'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
     ),
     6 => 
     array (
       'city' => 'Beijing',
       'continent' => 'AS',
       'zone' => 'CN',
-      'url' => 'ftp://ftp.sjtu.edu.cn/mageia',
+      'url' => 'ftp://mirrors.yun-idc.com/mageia',
     ),
     7 => 
     array (
-      'city' => 'HsinChu',
+      'city' => 'Tsukuba',
       'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'http://ftp.twaren.net/Linux/Mageia',
+      'zone' => 'JP',
+      'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
     8 => 
     array (
-      'city' => 'Beijing',
+      'city' => 'HsinChu',
       'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'http://ftp.sjtu.edu.cn/mageia',
+      'zone' => 'TW',
+      'url' => 'http://free.nchc.org.tw/mageia',
     ),
     9 => 
     array (
-      'city' => 'Tsukuba',
+      'city' => '石川',
       'continent' => 'AS',
       'zone' => 'JP',
-      'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
+      'url' => 'http://ftp.jaist.ac.jp/pub/Linux/Mageia',
     ),
     10 => 
     array (
-      'city' => 'Taipei',
+      'city' => 'HsinChu',
       'continent' => 'AS',
       'zone' => 'TW',
-      'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
+      'url' => 'http://ftp.twaren.net/Linux/Mageia',
     ),
     11 => 
     array (
-      'city' => 'Hefei',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'http://mirrors.ustc.edu.cn/mageia',
-    ),
-    12 => 
-    array (
       'city' => 'Taipei',
       'continent' => 'AS',
       'zone' => 'TW',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-  ),
-  'GR' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Heraklion',
-      'continent' => 'EU',
-      'zone' => 'GR',
-      'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Heraklion',
-      'continent' => 'EU',
-      'zone' => 'GR',
-      'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
-    ),
-  ),
-  'AU' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Brisbane',
-      'continent' => 'OC',
-      'zone' => 'AU',
-      'url' => 'ftp://mirror.aarnet.edu.au/pub/mageia',
-    ),
-    1 => 
+    12 => 
     array (
-      'city' => 'Brisbane',
-      'continent' => 'OC',
-      'zone' => 'AU',
-      'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
+      'city' => 'Hefei',
+      'continent' => 'AS',
+      'zone' => 'CN',
+      'url' => 'http://mirrors.ustc.edu.cn/mageia',
     ),
   ),
-  '_C:OC' => 
+  'TW' => 
   array (
     0 => 
     array (
-      'city' => 'Brisbane',
-      'continent' => 'OC',
-      'zone' => 'AU',
-      'url' => 'ftp://mirror.aarnet.edu.au/pub/mageia',
+      'city' => 'HsinChu',
+      'continent' => 'AS',
+      'zone' => 'TW',
+      'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
     1 => 
     array (
-      'city' => 'Brisbane',
-      'continent' => 'OC',
-      'zone' => 'AU',
-      'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
+      'city' => 'HsinChu',
+      'continent' => 'AS',
+      'zone' => 'TW',
+      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-  ),
-  'CA' => 
-  array (
-    0 => 
+    2 => 
     array (
-      'city' => 'Toronto',
-      'continent' => 'NA',
-      'zone' => 'CA',
-      'url' => 'ftp://mageia.webconquest.com',
+      'city' => 'Taipei',
+      'continent' => 'AS',
+      'zone' => 'TW',
+      'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    1 => 
+    3 => 
     array (
-      'city' => 'Toronto',
-      'continent' => 'NA',
-      'zone' => 'CA',
-      'url' => 'http://mageia.webconquest.com',
+      'city' => 'HsinChu',
+      'continent' => 'AS',
+      'zone' => 'TW',
+      'url' => 'http://free.nchc.org.tw/mageia',
     ),
-  ),
-  'CH' => 
-  array (
-    0 => 
+    4 => 
     array (
-      'city' => 'geneva',
-      'continent' => 'EU',
-      'zone' => 'CH',
-      'url' => 'http://mageia.unige.ch/mirror',
+      'city' => 'HsinChu',
+      'continent' => 'AS',
+      'zone' => 'TW',
+      'url' => 'http://ftp.twaren.net/Linux/Mageia',
     ),
-    1 => 
+    5 => 
     array (
-      'city' => 'Lucern',
-      'continent' => 'EU',
-      'zone' => 'CH',
-      'url' => 'ftp://ftp.LinuxCabal.org/pub/mirrors/Mageia',
+      'city' => 'Taipei',
+      'continent' => 'AS',
+      'zone' => 'TW',
+      'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
   ),
-  'DE' => 
+  'SE' => 
   array (
     0 => 
     array (
-      'city' => 'Esslingen',
+      'city' => 'Umeå',
       'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
+      'zone' => 'SE',
+      'url' => 'ftp://ftp.acc.umu.se/mirror/mageia',
     ),
     1 => 
     array (
-      'city' => '?',
+      'city' => 'Uppsala',
       'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://mirror2.tuxinator.org/mageia',
+      'zone' => 'SE',
+      'url' => 'http://ftp.sunet.se/pub/Linux/distributions/mageia',
     ),
     2 => 
     array (
-      'city' => 'Cologne',
+      'city' => 'Umeå',
       'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://mirror.netcologne.de/mageia',
+      'zone' => 'SE',
+      'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
     3 => 
     array (
-      'city' => 'Göttingen',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
-    ),
-    4 => 
-    array (
-      'city' => 'Göttingen',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
-    ),
-    5 => 
-    array (
-      'city' => 'Cologne',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://mirror.netcologne.de/mageia',
-    ),
-    6 => 
-    array (
-      'city' => 'Erlangen',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
-    ),
-    7 => 
-    array (
-      'city' => 'Hermsdorf',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://mirror.tuxinator.org/mageia',
-    ),
-    8 => 
-    array (
-      'city' => 'Esslingen',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
-    ),
-    9 => 
-    array (
-      'city' => 'Hermsdorf',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://mirror.tuxinator.org/mageia',
-    ),
-    10 => 
-    array (
-      'city' => 'Erlangen',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
-    ),
-    11 => 
-    array (
-      'city' => '?',
+      'city' => 'Uppsala',
       'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://mirror2.tuxinator.org/mageia',
+      'zone' => 'SE',
+      'url' => 'ftp://ftp.sunet.se/pub/Linux/distributions/mageia',
     ),
   ),
   'CZ' => 
@@ -728,14 +594,14 @@
       'city' => 'Prague',
       'continent' => 'EU',
       'zone' => 'CZ',
-      'url' => 'http://mageia.mirror.dkm.cz/pub/mageia',
+      'url' => 'ftp://mageia.mirror.dkm.cz/pub/mageia',
     ),
     1 => 
     array (
       'city' => 'Prague',
       'continent' => 'EU',
       'zone' => 'CZ',
-      'url' => 'ftp://mageia.mirror.dkm.cz/pub/mageia',
+      'url' => 'http://mageia.mirror.dkm.cz/pub/mageia',
     ),
     2 => 
     array (
@@ -759,172 +625,237 @@
       'url' => 'http://mageia.supp.name',
     ),
   ),
-  'SE' => 
+  'US' => 
   array (
     0 => 
     array (
-      'city' => 'Umeå',
-      'continent' => 'EU',
-      'zone' => 'SE',
-      'url' => 'ftp://ftp.acc.umu.se/mirror/mageia',
+      'city' => '?',
+      'continent' => 'NA',
+      'zone' => 'US',
+      'url' => 'http://mirrors.kernel.org/mageia',
     ),
     1 => 
     array (
-      'city' => 'Uppsala',
-      'continent' => 'EU',
-      'zone' => 'SE',
-      'url' => 'http://ftp.sunet.se/pub/Linux/distributions/mageia',
+      'city' => 'Southfeild',
+      'continent' => 'NA',
+      'zone' => 'US',
+      'url' => 'http://mirror.nexcess.net/mageia',
     ),
     2 => 
     array (
-      'city' => 'Umeå',
-      'continent' => 'EU',
-      'zone' => 'SE',
-      'url' => 'http://ftp.acc.umu.se/mirror/mageia',
+      'city' => 'Southfeild',
+      'continent' => 'NA',
+      'zone' => 'US',
+      'url' => 'ftp://mirror.nexcess.net/mageia',
     ),
     3 => 
     array (
-      'city' => 'Uppsala',
-      'continent' => 'EU',
-      'zone' => 'SE',
-      'url' => 'ftp://ftp.sunet.se/pub/Linux/distributions/mageia',
+      'city' => '?',
+      'continent' => 'NA',
+      'zone' => 'US',
+      'url' => 'ftp://mirrors.kernel.org/mageia',
     ),
   ),
-  'CN' => 
+  '_C:NA' => 
   array (
     0 => 
     array (
-      'city' => 'Beijing',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'http://mirrors.yun-idc.com/mageia',
+      'city' => '?',
+      'continent' => 'NA',
+      'zone' => 'US',
+      'url' => 'http://mirrors.kernel.org/mageia',
     ),
     1 => 
     array (
-      'city' => 'Beijing',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'ftp://ftp.sjtu.edu.cn/mageia',
+      'city' => 'Toronto',
+      'continent' => 'NA',
+      'zone' => 'CA',
+      'url' => 'ftp://mageia.webconquest.com',
     ),
     2 => 
     array (
-      'city' => 'Beijing',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'http://ftp.sjtu.edu.cn/mageia',
+      'city' => 'Toronto',
+      'continent' => 'NA',
+      'zone' => 'CA',
+      'url' => 'http://mageia.webconquest.com',
     ),
     3 => 
     array (
-      'city' => 'Hefei',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'http://mirrors.ustc.edu.cn/mageia',
+      'city' => 'Southfeild',
+      'continent' => 'NA',
+      'zone' => 'US',
+      'url' => 'http://mirror.nexcess.net/mageia',
+    ),
+    4 => 
+    array (
+      'city' => 'Southfeild',
+      'continent' => 'NA',
+      'zone' => 'US',
+      'url' => 'ftp://mirror.nexcess.net/mageia',
+    ),
+    5 => 
+    array (
+      'city' => '?',
+      'continent' => 'NA',
+      'zone' => 'US',
+      'url' => 'ftp://mirrors.kernel.org/mageia',
     ),
   ),
-  'TW' => 
+  'CH' => 
   array (
     0 => 
     array (
-      'city' => 'HsinChu',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
+      'city' => 'geneva',
+      'continent' => 'EU',
+      'zone' => 'CH',
+      'url' => 'http://mageia.unige.ch/mirror',
     ),
     1 => 
     array (
-      'city' => 'HsinChu',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'http://free.nchc.org.tw/mageia',
+      'city' => 'Lucern',
+      'continent' => 'EU',
+      'zone' => 'CH',
+      'url' => 'ftp://ftp.LinuxCabal.org/pub/mirrors/Mageia',
     ),
-    2 => 
+  ),
+  'CA' => 
+  array (
+    0 => 
     array (
-      'city' => 'HsinChu',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'http://ftp.twaren.net/Linux/Mageia',
+      'city' => 'Toronto',
+      'continent' => 'NA',
+      'zone' => 'CA',
+      'url' => 'ftp://mageia.webconquest.com',
     ),
-    3 => 
+    1 => 
     array (
-      'city' => 'Taipei',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
+      'city' => 'Toronto',
+      'continent' => 'NA',
+      'zone' => 'CA',
+      'url' => 'http://mageia.webconquest.com',
     ),
-    4 => 
+  ),
+  'AU' => 
+  array (
+    0 => 
     array (
-      'city' => 'Taipei',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
+      'city' => 'Brisbane',
+      'continent' => 'OC',
+      'zone' => 'AU',
+      'url' => 'ftp://mirror.aarnet.edu.au/pub/mageia',
+    ),
+    1 => 
+    array (
+      'city' => 'Brisbane',
+      'continent' => 'OC',
+      'zone' => 'AU',
+      'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
     ),
   ),
-  'BG' => 
+  '_C:OC' => 
   array (
     0 => 
     array (
-      'city' => 'Sofia',
-      'continent' => 'EU',
-      'zone' => 'BG',
-      'url' => 'http://mandriva.cointech.net/pub/Mageia',
+      'city' => 'Brisbane',
+      'continent' => 'OC',
+      'zone' => 'AU',
+      'url' => 'ftp://mirror.aarnet.edu.au/pub/mageia',
+    ),
+    1 => 
+    array (
+      'city' => 'Brisbane',
+      'continent' => 'OC',
+      'zone' => 'AU',
+      'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
     ),
   ),
-  'AR' => 
+  'NL' => 
   array (
     0 => 
     array (
-      'city' => 'Buenos Aires',
-      'continent' => 'SA',
-      'zone' => 'AR',
-      'url' => 'http://mageia.xfree.com.ar',
+      'city' => 'Enschede',
+      'continent' => 'EU',
+      'zone' => 'NL',
+      'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
+    ),
+    1 => 
+    array (
+      'city' => 'Enschede',
+      'continent' => 'EU',
+      'zone' => 'NL',
+      'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
+    ),
+    2 => 
+    array (
+      'city' => 'Amsterdam',
+      'continent' => 'EU',
+      'zone' => 'NL',
+      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
   ),
-  '_C:SA' => 
+  'CN' => 
   array (
     0 => 
     array (
-      'city' => 'Buenos Aires',
-      'continent' => 'SA',
-      'zone' => 'AR',
-      'url' => 'http://mageia.xfree.com.ar',
+      'city' => 'Beijing',
+      'continent' => 'AS',
+      'zone' => 'CN',
+      'url' => 'http://mirrors.yun-idc.com/mageia',
     ),
     1 => 
     array (
-      'city' => '?',
+      'city' => 'Beijing',
+      'continent' => 'AS',
+      'zone' => 'CN',
+      'url' => 'ftp://mirrors.yun-idc.com/mageia',
+    ),
+    2 => 
+    array (
+      'city' => 'Hefei',
+      'continent' => 'AS',
+      'zone' => 'CN',
+      'url' => 'http://mirrors.ustc.edu.cn/mageia',
+    ),
+  ),
+  'BR' => 
+  array (
+    0 => 
+    array (
+      'city' => 'Campinas',
       'continent' => 'SA',
       'zone' => 'BR',
-      'url' => 'http://mageia.c3sl.ufpr.br',
+      'url' => 'ftp://ftp.las.ic.unicamp.br/pub/mageia',
     ),
-    2 => 
+    1 => 
     array (
       'city' => 'Campinas',
       'continent' => 'SA',
       'zone' => 'BR',
       'url' => 'http://ftp.las.ic.unicamp.br/pub/mageia',
     ),
-    3 => 
+    2 => 
     array (
       'city' => 'Brasilia',
       'continent' => 'SA',
       'zone' => 'BR',
-      'url' => 'http://mageia.fis.unb.br',
+      'url' => 'ftp://mageia.fis.unb.br/mageia',
     ),
-    4 => 
+    3 => 
     array (
-      'city' => '?',
+      'city' => 'Brasilia',
       'continent' => 'SA',
       'zone' => 'BR',
-      'url' => 'ftp://mageia.c3sl.ufpr.br/mageia',
+      'url' => 'http://mageia.fis.unb.br',
     ),
   ),
-  'BR' => 
+  '_C:SA' => 
   array (
     0 => 
     array (
-      'city' => '?',
+      'city' => 'Campinas',
       'continent' => 'SA',
       'zone' => 'BR',
-      'url' => 'http://mageia.c3sl.ufpr.br',
+      'url' => 'ftp://ftp.las.ic.unicamp.br/pub/mageia',
     ),
     1 => 
     array (
@@ -938,45 +869,58 @@
       'city' => 'Brasilia',
       'continent' => 'SA',
       'zone' => 'BR',
-      'url' => 'http://mageia.fis.unb.br',
+      'url' => 'ftp://mageia.fis.unb.br/mageia',
     ),
     3 => 
     array (
-      'city' => '?',
+      'city' => 'Brasilia',
       'continent' => 'SA',
       'zone' => 'BR',
-      'url' => 'ftp://mageia.c3sl.ufpr.br/mageia',
+      'url' => 'http://mageia.fis.unb.br',
     ),
   ),
-  'IT' => 
+  'BG' => 
   array (
     0 => 
     array (
-      'city' => 'Roma',
+      'city' => 'Sofia',
       'continent' => 'EU',
-      'zone' => 'IT',
-      'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
+      'zone' => 'BG',
+      'url' => 'http://mandriva.cointech.net/pub/Mageia',
     ),
-    1 => 
+  ),
+  'GB' => 
+  array (
+    0 => 
     array (
-      'city' => 'Roma',
+      'city' => 'Canterbury',
       'continent' => 'EU',
-      'zone' => 'IT',
-      'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
+      'zone' => 'GB',
+      'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    2 => 
+    1 => 
     array (
-      'city' => 'Milan',
+      'city' => 'Canterbury',
       'continent' => 'EU',
-      'zone' => 'IT',
-      'url' => 'http://vodka.sublink.org/mageia',
+      'zone' => 'GB',
+      'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    3 => 
+  ),
+  'JP' => 
+  array (
+    0 => 
     array (
-      'city' => 'Milan',
-      'continent' => 'EU',
-      'zone' => 'IT',
-      'url' => 'ftp://vodka.sublink.org/mageia',
+      'city' => 'Tsukuba',
+      'continent' => 'AS',
+      'zone' => 'JP',
+      'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
+    ),
+    1 => 
+    array (
+      'city' => '石川',
+      'continent' => 'AS',
+      'zone' => 'JP',
+      'url' => 'http://ftp.jaist.ac.jp/pub/Linux/Mageia',
     ),
   ),
   'FR' => 
@@ -990,58 +934,41 @@
     ),
     1 => 
     array (
-      'city' => 'Lyon',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'http://fr2.rpmfind.net/linux/mageia',
-    ),
-    2 => 
-    array (
-      'city' => 'Lyon',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
-    ),
-    3 => 
-    array (
       'city' => 'Paris',
       'continent' => 'EU',
       'zone' => 'FR',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
   ),
-  'RU' => 
+  'IT' => 
   array (
     0 => 
     array (
-      'city' => 'Moscow',
+      'city' => 'Milan',
       'continent' => 'EU',
-      'zone' => 'RU',
-      'url' => 'http://mirror.yandex.ru/mageia',
+      'zone' => 'IT',
+      'url' => 'http://vodka.sublink.org/mageia',
     ),
     1 => 
     array (
-      'city' => 'Moscow',
+      'city' => 'Roma',
       'continent' => 'EU',
-      'zone' => 'RU',
-      'url' => 'ftp://mirror.yandex.ru/mageia',
+      'zone' => 'IT',
+      'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-  ),
-  'GB' => 
-  array (
-    0 => 
+    2 => 
     array (
-      'city' => 'Canterbury',
+      'city' => 'Roma',
       'continent' => 'EU',
-      'zone' => 'GB',
-      'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
+      'zone' => 'IT',
+      'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    1 => 
+    3 => 
     array (
-      'city' => 'Canterbury',
+      'city' => 'Milan',
       'continent' => 'EU',
-      'zone' => 'GB',
-      'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
+      'zone' => 'IT',
+      'url' => 'ftp://vodka.sublink.org/mageia',
     ),
   ),
   'BE' => 
@@ -1054,21 +981,21 @@
       'url' => 'http://ftp.belnet.be/mageia',
     ),
   ),
-  'JP' => 
+  'RU' => 
   array (
     0 => 
     array (
-      'city' => '石川',
-      'continent' => 'AS',
-      'zone' => 'JP',
-      'url' => 'http://ftp.jaist.ac.jp/pub/Linux/Mageia',
+      'city' => 'Moscow',
+      'continent' => 'EU',
+      'zone' => 'RU',
+      'url' => 'http://mirror.yandex.ru/mageia',
     ),
     1 => 
     array (
-      'city' => 'Tsukuba',
-      'continent' => 'AS',
-      'zone' => 'JP',
-      'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
+      'city' => 'Moscow',
+      'continent' => 'EU',
+      'zone' => 'RU',
+      'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
   ),
   'BY' =>