updated mirrors list - see bug 8277

1 files changed, 487 insertions, 425 deletions

diff --git a/lib/cached.list.php b/lib/cached.list.php
index 1a44329df..dacf77d7e 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -1,204 +1,246 @@
 <?php $mirrors = array (
-  'NL' => 
+  'DE' => 
   array (
     0 => 
     array (
-      'city' => 'Amsterdam',
+      'city' => 'Esslingen',
       'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+      'zone' => 'DE',
+      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
     1 => 
     array (
-      'city' => 'Amsterdam',
+      'city' => 'Göttingen',
       'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+      'zone' => 'DE',
+      'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
+    ),
+    2 => 
+    array (
+      'city' => 'Göttingen',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
+    ),
+    3 => 
+    array (
+      'city' => 'Erlangen',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
+    ),
+    4 => 
+    array (
+      'city' => 'Hermsdorf',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'http://mirror.tuxinator.org/mageia',
+    ),
+    5 => 
+    array (
+      'city' => 'Hermsdorf',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'ftp://mirror.tuxinator.org/mageia',
+    ),
+    6 => 
+    array (
+      'city' => 'Erlangen',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
+    ),
+    7 => 
+    array (
+      'city' => 'Esslingen',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
   ),
   '_C:EU' => 
   array (
     0 => 
     array (
-      'city' => 'Amsterdam',
+      'city' => 'Esslingen',
       'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+      'zone' => 'DE',
+      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
     1 => 
     array (
-      'city' => 'Göttingen',
+      'city' => 'Prague',
       'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
+      'zone' => 'CZ',
+      'url' => 'ftp://mageia.mirror.dkm.cz/pub/mageia',
     ),
     2 => 
     array (
-      'city' => 'Erfurt',
+      'city' => 'Amsterdam',
       'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://ftp.mandrivauser.de/mirrors/Mageia',
+      'zone' => 'NL',
+      'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
     3 => 
     array (
-      'city' => 'Minsk',
+      'city' => 'Umeå',
       'continent' => 'EU',
-      'zone' => 'BY',
-      'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
+      'zone' => 'SE',
+      'url' => 'ftp://ftp.acc.umu.se/mirror/mageia',
     ),
     4 => 
     array (
-      'city' => 'Esslingen',
+      'city' => 'Brno',
       'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
+      'zone' => 'CZ',
+      'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
     ),
     5 => 
     array (
-      'city' => 'Prague',
+      'city' => '?',
       'continent' => 'EU',
       'zone' => 'CZ',
-      'url' => 'http://mageia.mirror.dkm.cz/pub/mageia',
+      'url' => 'http://mageia.supp.name',
     ),
     6 => 
     array (
       'city' => '?',
       'continent' => 'EU',
-      'zone' => 'CZ',
-      'url' => 'http://mageia.supp.name',
+      'zone' => 'PL',
+      'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
     7 => 
     array (
-      'city' => 'Amsterdam',
+      'city' => 'Brno',
       'continent' => 'EU',
-      'zone' => 'NL',
-      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+      'zone' => 'CZ',
+      'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
     ),
     8 => 
     array (
-      'city' => 'Prague',
+      'city' => 'Paris',
       'continent' => 'EU',
-      'zone' => 'CZ',
-      'url' => 'ftp://mageia.mirror.dkm.cz/pub/mageia',
+      'zone' => 'FR',
+      'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
     9 => 
     array (
-      'city' => 'Paris',
+      'city' => 'Heraklion',
       'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+      'zone' => 'GR',
+      'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
     10 => 
     array (
-      'city' => 'Vitry-sur-Seine',
+      'city' => 'Prague',
       'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'ftp://twiska.zarb.org/mageia',
+      'zone' => 'CZ',
+      'url' => 'http://mageia.mirror.dkm.cz/pub/mageia',
     ),
     11 => 
     array (
-      'city' => 'Brno',
+      'city' => 'Amsterdam',
       'continent' => 'EU',
-      'zone' => 'CZ',
-      'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
+      'zone' => 'NL',
+      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
     12 => 
     array (
-      'city' => 'Brno',
+      'city' => 'geneva',
       'continent' => 'EU',
-      'zone' => 'CZ',
-      'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
+      'zone' => 'CH',
+      'url' => 'http://mageia.unige.ch/mirror',
     ),
     13 => 
     array (
-      'city' => 'Esslingen',
+      'city' => 'Göttingen',
       'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
+      'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
     14 => 
     array (
-      'city' => '?',
+      'city' => 'Göttingen',
       'continent' => 'EU',
-      'zone' => 'SE',
-      'url' => 'ftp://ftp.acc.umu.se/mirror/mageia',
+      'zone' => 'DE',
+      'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
     ),
     15 => 
     array (
-      'city' => 'Vitry-sur-Seine',
+      'city' => 'Paris',
       'continent' => 'EU',
       'zone' => 'FR',
-      'url' => 'http://twiska.zarb.org/mageia',
+      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
     16 => 
     array (
-      'city' => 'Lucern',
+      'city' => 'Erlangen',
       'continent' => 'EU',
-      'zone' => 'CH',
-      'url' => 'ftp://ftp.LinuxCabal.org/pub/mirrors/Mageia',
+      'zone' => 'DE',
+      'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
     ),
     17 => 
     array (
-      'city' => 'Göttingen',
+      'city' => '?',
       'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
+      'zone' => 'PL',
+      'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
     18 => 
     array (
       'city' => 'Uppsala',
       'continent' => 'EU',
       'zone' => 'SE',
-      'url' => 'ftp://ftp.sunet.se/pub/Linux/distributions/mageia',
+      'url' => 'http://ftp.sunet.se/pub/Linux/distributions/mageia',
     ),
     19 => 
     array (
-      'city' => 'Paris',
+      'city' => 'Lyon',
       'continent' => 'EU',
       'zone' => 'FR',
-      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+      'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
     20 => 
     array (
-      'city' => 'Hermsdorf',
+      'city' => 'Minsk',
       'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://mirror.tuxinator.org/mageia',
+      'zone' => 'BY',
+      'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
     21 => 
     array (
-      'city' => 'Erlangen',
+      'city' => 'Heraklion',
       'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
+      'zone' => 'GR',
+      'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
     22 => 
     array (
-      'city' => 'Erlangen',
+      'city' => 'Uppsala',
       'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
+      'zone' => 'SE',
+      'url' => 'ftp://ftp.sunet.se/pub/Linux/distributions/mageia',
     ),
     23 => 
     array (
-      'city' => 'Perugia',
+      'city' => 'Moscow',
       'continent' => 'EU',
-      'zone' => 'IT',
-      'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
+      'zone' => 'RU',
+      'url' => 'http://mirror.yandex.ru/mageia',
     ),
     24 => 
     array (
-      'city' => 'Lyon',
+      'city' => 'Canterbury',
       'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'http://fr2.rpmfind.net/linux/mageia',
+      'zone' => 'GB',
+      'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
     25 => 
     array (
-      'city' => 'Uppsala',
+      'city' => 'Minsk',
       'continent' => 'EU',
-      'zone' => 'SE',
-      'url' => 'http://ftp.sunet.se/pub/Linux/distributions/mageia',
+      'zone' => 'BY',
+      'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
     26 => 
     array (
@@ -209,10 +251,10 @@
     ),
     27 => 
     array (
-      'city' => 'Moscow',
+      'city' => 'Hermsdorf',
       'continent' => 'EU',
-      'zone' => 'RU',
-      'url' => 'http://mirror.yandex.ru/mageia',
+      'zone' => 'DE',
+      'url' => 'http://mirror.tuxinator.org/mageia',
     ),
     28 => 
     array (
@@ -223,135 +265,66 @@
     ),
     29 => 
     array (
-      'city' => '?',
+      'city' => 'Umeå',
       'continent' => 'EU',
       'zone' => 'SE',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
     30 => 
     array (
-      'city' => 'Lyon',
+      'city' => 'Erlangen',
       'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
+      'zone' => 'DE',
+      'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
     ),
     31 => 
     array (
-      'city' => 'Minsk',
+      'city' => 'Paris',
       'continent' => 'EU',
-      'zone' => 'BY',
-      'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org',
+      'zone' => 'FR',
+      'url' => 'http://mageia.r0b0t.fr/linux/Mageia',
     ),
     32 => 
     array (
-      'city' => 'Erfurt',
+      'city' => 'Lyon',
       'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://ftp.mandrivauser.de/mirrors/Mageia',
+      'zone' => 'FR',
+      'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
     ),
     33 => 
     array (
-      'city' => 'Perugia',
+      'city' => 'Lucern',
       'continent' => 'EU',
-      'zone' => 'IT',
-      'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
+      'zone' => 'CH',
+      'url' => 'ftp://ftp.LinuxCabal.org/pub/mirrors/Mageia',
     ),
     34 => 
     array (
-      'city' => 'Paris',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'http://mageia.r0b0t.fr/linux/Mageia',
-    ),
-  ),
-  'DE' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Göttingen',
+      'city' => 'Perugia',
       'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
+      'zone' => 'IT',
+      'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    1 => 
+    35 => 
     array (
-      'city' => 'Erfurt',
+      'city' => 'Canterbury',
       'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://ftp.mandrivauser.de/mirrors/Mageia',
+      'zone' => 'GB',
+      'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    2 => 
-    array (
-      'city' => 'Esslingen',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
-    ),
-    3 => 
+    36 => 
     array (
       'city' => 'Esslingen',
       'continent' => 'EU',
       'zone' => 'DE',
       'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    4 => 
-    array (
-      'city' => 'Göttingen',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
-    ),
-    5 => 
-    array (
-      'city' => 'Hermsdorf',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://mirror.tuxinator.org/mageia',
-    ),
-    6 => 
-    array (
-      'city' => 'Erlangen',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
-    ),
-    7 => 
-    array (
-      'city' => 'Erlangen',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
-    ),
-    8 => 
-    array (
-      'city' => 'Hermsdorf',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://mirror.tuxinator.org/mageia',
-    ),
-    9 => 
-    array (
-      'city' => 'Erfurt',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'http://ftp.mandrivauser.de/mirrors/Mageia',
-    ),
-  ),
-  'BY' => 
-  array (
-    0 => 
+    38 => 
     array (
-      'city' => 'Minsk',
-      'continent' => 'EU',
-      'zone' => 'BY',
-      'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
-    ),
-    1 => 
-    array (
-      'city' => 'Minsk',
+      'city' => 'Perugia',
       'continent' => 'EU',
-      'zone' => 'BY',
-      'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org',
+      'zone' => 'IT',
+      'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
     ),
   ),
   'CZ' => 
@@ -361,21 +334,21 @@
       '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' => '?',
+      'city' => 'Brno',
       'continent' => 'EU',
       'zone' => 'CZ',
-      'url' => 'http://mageia.supp.name',
+      'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
     ),
     2 => 
     array (
-      'city' => 'Prague',
+      'city' => '?',
       'continent' => 'EU',
       'zone' => 'CZ',
-      'url' => 'ftp://mageia.mirror.dkm.cz/pub/mageia',
+      'url' => 'http://mageia.supp.name',
     ),
     3 => 
     array (
@@ -386,72 +359,10 @@
     ),
     4 => 
     array (
-      'city' => 'Brno',
+      'city' => 'Prague',
       'continent' => 'EU',
       'zone' => 'CZ',
-      'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
-    ),
-  ),
-  'AU' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Brisbane',
-      'continent' => 'OC',
-      'zone' => 'AU',
-      'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Brisbane',
-      'continent' => 'OC',
-      'zone' => 'AU',
-      'url' => 'ftp://mirror.aarnet.edu.au/pub/mageia',
-    ),
-    2 => 
-    array (
-      'city' => 'Adelaide',
-      'continent' => 'OC',
-      'zone' => 'AU',
-      'url' => 'http://mirror.internode.on.net/pub/mageia',
-    ),
-  ),
-  '_C:OC' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Brisbane',
-      'continent' => 'OC',
-      'zone' => 'AU',
-      'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Brisbane',
-      'continent' => 'OC',
-      'zone' => 'AU',
-      'url' => 'ftp://mirror.aarnet.edu.au/pub/mageia',
-    ),
-    2 => 
-    array (
-      'city' => 'Nouméa',
-      'continent' => 'OC',
-      'zone' => 'NC',
-      'url' => 'ftp://mageia.nautile.nc/mageia',
-    ),
-    3 => 
-    array (
-      'city' => 'Nouméa',
-      'continent' => 'OC',
-      'zone' => 'NC',
-      'url' => 'http://mageia.nautile.nc/mageia',
-    ),
-    4 => 
-    array (
-      'city' => 'Adelaide',
-      'continent' => 'OC',
-      'zone' => 'AU',
-      'url' => 'http://mirror.internode.on.net/pub/mageia',
+      'url' => 'http://mageia.mirror.dkm.cz/pub/mageia',
     ),
   ),
   'US' => 
@@ -470,13 +381,6 @@
       'zone' => 'US',
       'url' => 'ftp://mirrors.kernel.org/mageia',
     ),
-    3 => 
-    array (
-      'city' => 'Lenoir',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirror.dacentec.com/mageia',
-    ),
   ),
   '_C:NA' => 
   array (
@@ -487,157 +391,74 @@
       'zone' => 'US',
       'url' => 'http://mirrors.kernel.org/mageia',
     ),
-    1 => 
-    array (
-      'city' => 'Toronto',
-      'continent' => 'NA',
-      'zone' => 'CA',
-      'url' => 'http://mageia.webconquest.com',
-    ),
-    3 => 
-    array (
-      'city' => '?',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'ftp://mirrors.kernel.org/mageia',
-    ),
-    4 => 
+    2 => 
     array (
       'city' => 'Toronto',
       'continent' => 'NA',
       'zone' => 'CA',
       'url' => 'ftp://mageia.webconquest.com',
     ),
-    5 => 
-    array (
-      'city' => 'Lenoir',
-      'continent' => 'NA',
-      'zone' => 'US',
-      'url' => 'http://mirror.dacentec.com/mageia',
-    ),
-  ),
-  'CA' => 
-  array (
-    0 => 
+    3 => 
     array (
       'city' => 'Toronto',
       'continent' => 'NA',
       'zone' => 'CA',
       'url' => 'http://mageia.webconquest.com',
     ),
-    1 => 
-    array (
-      'city' => 'Toronto',
-      'continent' => 'NA',
-      'zone' => 'CA',
-      'url' => 'ftp://mageia.webconquest.com',
-    ),
-  ),
-  'FR' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Paris',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Vitry-sur-Seine',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'ftp://twiska.zarb.org/mageia',
-    ),
-    2 => 
-    array (
-      'city' => 'Vitry-sur-Seine',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'http://twiska.zarb.org/mageia',
-    ),
-    3 => 
-    array (
-      'city' => 'Paris',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
-    ),
     4 => 
     array (
-      'city' => 'Lyon',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'http://fr2.rpmfind.net/linux/mageia',
-    ),
-    5 => 
-    array (
-      'city' => 'Lyon',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
-    ),
-    6 => 
-    array (
-      'city' => 'Paris',
-      'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'http://mageia.r0b0t.fr/linux/Mageia',
+      'city' => '?',
+      'continent' => 'NA',
+      'zone' => 'US',
+      'url' => 'ftp://mirrors.kernel.org/mageia',
     ),
   ),
-  'TW' => 
+  'CN' => 
   array (
     0 => 
     array (
-      'city' => 'HsinChu',
+      'city' => 'Beijing',
       'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'http://ftp.twaren.net/Linux/Mageia',
+      'zone' => 'CN',
+      'url' => 'http://fundawang.lcuc.org.cn/mageia',
     ),
     1 => 
     array (
-      'city' => 'HsinChu',
+      'city' => 'Beijing',
       'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'http://free.nchc.org.tw/mageia',
+      'zone' => 'CN',
+      'url' => 'http://ftp.sjtu.edu.cn/mageia',
     ),
     2 => 
     array (
-      'city' => 'HsinChu',
-      'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
-    ),
-    3 => 
-    array (
-      'city' => 'HsinChu',
+      'city' => 'Beijing',
       'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'ftp://free.nchc.org.tw/mageia',
+      'zone' => 'CN',
+      'url' => 'ftp://ftp.sjtu.edu.cn/mageia',
     ),
   ),
   '_C:AS' => 
   array (
     0 => 
     array (
-      'city' => 'HsinChu',
+      'city' => 'Beijing',
       'continent' => 'AS',
-      'zone' => 'TW',
-      'url' => 'http://ftp.twaren.net/Linux/Mageia',
+      'zone' => 'CN',
+      'url' => 'http://fundawang.lcuc.org.cn/mageia',
     ),
     1 => 
     array (
       'city' => 'Bandung',
       'continent' => 'AS',
       'zone' => 'ID',
-      'url' => 'ftp://ftp.itb.ac.id/pub/mageia',
+      'url' => 'http://ftp.itb.ac.id/pub/mageia',
     ),
     2 => 
     array (
       'city' => 'Bandung',
       'continent' => 'AS',
       'zone' => 'ID',
-      'url' => 'http://ftp.itb.ac.id/pub/mageia',
+      'url' => 'ftp://ftp.itb.ac.id/pub/mageia',
     ),
     3 => 
     array (
@@ -651,14 +472,14 @@
       'city' => 'HsinChu',
       'continent' => 'AS',
       'zone' => 'TW',
-      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
+      'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
     5 => 
     array (
       'city' => 'HsinChu',
       'continent' => 'AS',
       'zone' => 'TW',
-      'url' => 'ftp://free.nchc.org.tw/mageia',
+      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
     6 => 
     array (
@@ -674,22 +495,57 @@
       'zone' => 'CN',
       'url' => 'ftp://ftp.sjtu.edu.cn/mageia',
     ),
+    8 => 
+    array (
+      'city' => 'Tsukuba',
+      'continent' => 'AS',
+      'zone' => 'JP',
+      'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
+    ),
+    9 => 
+    array (
+      'city' => 'HsinChu',
+      'continent' => 'AS',
+      'zone' => 'TW',
+      'url' => 'http://ftp.twaren.net/Linux/Mageia',
+    ),
+    10 => 
+    array (
+      'city' => '石川',
+      'continent' => 'AS',
+      'zone' => 'JP',
+      'url' => 'http://ftp.jaist.ac.jp/pub/Linux/Mageia',
+    ),
+    11 => 
+    array (
+      'city' => 'Taipei',
+      'continent' => 'AS',
+      'zone' => 'TW',
+      'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
+    ),
+    12 => 
+    array (
+      'city' => 'Taipei',
+      'continent' => 'AS',
+      'zone' => 'TW',
+      'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
+    ),
   ),
-  'ID' => 
+  'CA' => 
   array (
     0 => 
     array (
-      'city' => 'Bandung',
-      'continent' => 'AS',
-      'zone' => 'ID',
-      'url' => 'ftp://ftp.itb.ac.id/pub/mageia',
+      'city' => 'Toronto',
+      'continent' => 'NA',
+      'zone' => 'CA',
+      'url' => 'ftp://mageia.webconquest.com',
     ),
     1 => 
     array (
-      'city' => 'Bandung',
-      'continent' => 'AS',
-      'zone' => 'ID',
-      'url' => 'http://ftp.itb.ac.id/pub/mageia',
+      'city' => 'Toronto',
+      'continent' => 'NA',
+      'zone' => 'CA',
+      'url' => 'http://mageia.webconquest.com',
     ),
   ),
   'BR' => 
@@ -703,10 +559,10 @@
     ),
     1 => 
     array (
-      'city' => 'Brasilia',
+      'city' => '?',
       'continent' => 'SA',
       'zone' => 'BR',
-      'url' => 'http://mageia.fis.unb.br',
+      'url' => 'ftp://mageia.c3sl.ufpr.br/mageia',
     ),
     2 => 
     array (
@@ -717,10 +573,10 @@
     ),
     3 => 
     array (
-      'city' => '?',
+      'city' => 'Brasilia',
       'continent' => 'SA',
       'zone' => 'BR',
-      'url' => 'ftp://mageia.c3sl.ufpr.br/mageia',
+      'url' => 'http://mageia.fis.unb.br',
     ),
   ),
   '_C:SA' => 
@@ -734,10 +590,10 @@
     ),
     1 => 
     array (
-      'city' => 'Brasilia',
+      'city' => '?',
       'continent' => 'SA',
       'zone' => 'BR',
-      'url' => 'http://mageia.fis.unb.br',
+      'url' => 'ftp://mageia.c3sl.ufpr.br/mageia',
     ),
     2 => 
     array (
@@ -748,34 +604,34 @@
     ),
     3 => 
     array (
-      'city' => '?',
+      'city' => 'Brasilia',
       'continent' => 'SA',
       'zone' => 'BR',
-      'url' => 'ftp://mageia.c3sl.ufpr.br/mageia',
+      'url' => 'http://mageia.fis.unb.br',
     ),
   ),
-  'NC' => 
+  'NL' => 
   array (
     0 => 
     array (
-      'city' => 'Nouméa',
-      'continent' => 'OC',
-      'zone' => 'NC',
-      'url' => 'ftp://mageia.nautile.nc/mageia',
+      'city' => 'Amsterdam',
+      'continent' => 'EU',
+      'zone' => 'NL',
+      'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
     1 => 
     array (
-      'city' => 'Nouméa',
-      'continent' => 'OC',
-      'zone' => 'NC',
-      'url' => 'http://mageia.nautile.nc/mageia',
+      'city' => 'Amsterdam',
+      'continent' => 'EU',
+      'zone' => 'NL',
+      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
   ),
   'SE' => 
   array (
     0 => 
     array (
-      'city' => '?',
+      'city' => 'Umeå',
       'continent' => 'EU',
       'zone' => 'SE',
       'url' => 'ftp://ftp.acc.umu.se/mirror/mageia',
@@ -785,33 +641,256 @@
       'city' => 'Uppsala',
       'continent' => 'EU',
       'zone' => 'SE',
-      'url' => 'ftp://ftp.sunet.se/pub/Linux/distributions/mageia',
+      'url' => 'http://ftp.sunet.se/pub/Linux/distributions/mageia',
     ),
     2 => 
     array (
       'city' => 'Uppsala',
       'continent' => 'EU',
       'zone' => 'SE',
-      'url' => 'http://ftp.sunet.se/pub/Linux/distributions/mageia',
+      'url' => 'ftp://ftp.sunet.se/pub/Linux/distributions/mageia',
     ),
     3 => 
     array (
-      'city' => '?',
+      'city' => 'Umeå',
       'continent' => 'EU',
       'zone' => 'SE',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
   ),
+  'AU' => 
+  array (
+    0 => 
+    array (
+      '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',
+    ),
+    2 => 
+    array (
+      'city' => 'Adelaide',
+      'continent' => 'OC',
+      'zone' => 'AU',
+      'url' => 'http://mirror.internode.on.net/pub/mageia',
+    ),
+  ),
+  '_C:OC' => 
+  array (
+    0 => 
+    array (
+      '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',
+    ),
+    2 => 
+    array (
+      'city' => 'Adelaide',
+      'continent' => 'OC',
+      'zone' => 'AU',
+      'url' => 'http://mirror.internode.on.net/pub/mageia',
+    ),
+  ),
+  'FR' => 
+  array (
+    0 => 
+    array (
+      'city' => 'Paris',
+      'continent' => 'EU',
+      'zone' => 'FR',
+      'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+    ),
+    1 => 
+    array (
+      'city' => 'Paris',
+      'continent' => 'EU',
+      'zone' => 'FR',
+      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+    ),
+    2 => 
+    array (
+      'city' => 'Lyon',
+      'continent' => 'EU',
+      'zone' => 'FR',
+      'url' => 'http://fr2.rpmfind.net/linux/mageia',
+    ),
+    3 => 
+    array (
+      'city' => 'Paris',
+      'continent' => 'EU',
+      'zone' => 'FR',
+      'url' => 'http://mageia.r0b0t.fr/linux/Mageia',
+    ),
+    4 => 
+    array (
+      'city' => 'Lyon',
+      'continent' => 'EU',
+      'zone' => 'FR',
+      'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
+    ),
+  ),
+  'ID' => 
+  array (
+    0 => 
+    array (
+      'city' => 'Bandung',
+      'continent' => 'AS',
+      'zone' => 'ID',
+      'url' => 'http://ftp.itb.ac.id/pub/mageia',
+    ),
+    1 => 
+    array (
+      'city' => 'Bandung',
+      'continent' => 'AS',
+      'zone' => 'ID',
+      'url' => 'ftp://ftp.itb.ac.id/pub/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',
+    ),
+  ),
   'CH' => 
   array (
     0 => 
     array (
+      'city' => 'geneva',
+      'continent' => 'EU',
+      'zone' => 'CH',
+      'url' => 'http://mageia.unige.ch/mirror',
+    ),
+    1 => 
+    array (
       'city' => 'Lucern',
       'continent' => 'EU',
       'zone' => 'CH',
       'url' => 'ftp://ftp.LinuxCabal.org/pub/mirrors/Mageia',
     ),
   ),
+  'TW' => 
+  array (
+    0 => 
+    array (
+      'city' => 'HsinChu',
+      'continent' => 'AS',
+      'zone' => 'TW',
+      'url' => 'http://free.nchc.org.tw/mageia',
+    ),
+    1 => 
+    array (
+      'city' => 'HsinChu',
+      'continent' => 'AS',
+      'zone' => 'TW',
+      'url' => 'ftp://free.nchc.org.tw/mageia',
+    ),
+    2 => 
+    array (
+      'city' => 'HsinChu',
+      'continent' => 'AS',
+      'zone' => 'TW',
+      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
+    ),
+    3 => 
+    array (
+      'city' => 'HsinChu',
+      'continent' => 'AS',
+      'zone' => 'TW',
+      'url' => 'http://ftp.twaren.net/Linux/Mageia',
+    ),
+    4 => 
+    array (
+      'city' => 'Taipei',
+      'continent' => 'AS',
+      'zone' => 'TW',
+      'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
+    ),
+    5 => 
+    array (
+      'city' => 'Taipei',
+      'continent' => 'AS',
+      'zone' => 'TW',
+      'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
+    ),
+  ),
+  'BY' => 
+  array (
+    0 => 
+    array (
+      'city' => 'Minsk',
+      'continent' => 'EU',
+      'zone' => 'BY',
+      'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org',
+    ),
+    1 => 
+    array (
+      'city' => 'Minsk',
+      'continent' => 'EU',
+      'zone' => 'BY',
+      'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
+    ),
+  ),
+  'RU' => 
+  array (
+    0 => 
+    array (
+      'city' => 'Moscow',
+      'continent' => 'EU',
+      'zone' => 'RU',
+      'url' => 'http://mirror.yandex.ru/mageia',
+    ),
+    1 => 
+    array (
+      'city' => 'Moscow',
+      'continent' => 'EU',
+      'zone' => 'RU',
+      'url' => 'ftp://mirror.yandex.ru/mageia',
+    ),
+  ),
+  'GB' => 
+  array (
+    0 => 
+    array (
+      'city' => 'Canterbury',
+      'continent' => 'EU',
+      'zone' => 'GB',
+      'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
+    ),
+    1 => 
+    array (
+      'city' => 'Canterbury',
+      'continent' => 'EU',
+      'zone' => 'GB',
+      'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
+    ),
+  ),
   'ZA' => 
   array (
     0 => 
@@ -819,14 +898,14 @@
       'city' => 'Stellenbosch',
       'continent' => 'AF',
       'zone' => 'ZA',
-      'url' => 'ftp://ftp.sun.ac.za/pub/mirrors/mageia',
+      'url' => 'http://ftp.sun.ac.za/ftp/pub/mirrors/mageia',
     ),
     1 => 
     array (
       'city' => 'Stellenbosch',
       'continent' => 'AF',
       'zone' => 'ZA',
-      'url' => 'http://ftp.sun.ac.za/ftp/pub/mirrors/mageia',
+      'url' => 'ftp://ftp.sun.ac.za/pub/mirrors/mageia',
     ),
   ),
   '_C:AF' => 
@@ -836,65 +915,48 @@
       'city' => 'Stellenbosch',
       'continent' => 'AF',
       'zone' => 'ZA',
-      'url' => 'ftp://ftp.sun.ac.za/pub/mirrors/mageia',
+      'url' => 'http://ftp.sun.ac.za/ftp/pub/mirrors/mageia',
     ),
     1 => 
     array (
       'city' => 'Stellenbosch',
       'continent' => 'AF',
       'zone' => 'ZA',
-      'url' => 'http://ftp.sun.ac.za/ftp/pub/mirrors/mageia',
+      'url' => 'ftp://ftp.sun.ac.za/pub/mirrors/mageia',
     ),
   ),
-  'IT' => 
+  'JP' => 
   array (
     0 => 
     array (
-      'city' => 'Perugia',
-      'continent' => 'EU',
-      'zone' => 'IT',
-      'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
+      'city' => 'Tsukuba',
+      'continent' => 'AS',
+      'zone' => 'JP',
+      'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
     1 => 
     array (
-      'city' => 'Perugia',
-      'continent' => 'EU',
-      'zone' => 'IT',
-      'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
+      'city' => '石川',
+      'continent' => 'AS',
+      'zone' => 'JP',
+      'url' => 'http://ftp.jaist.ac.jp/pub/Linux/Mageia',
     ),
   ),
-  'RU' => 
+  'IT' => 
   array (
     0 => 
     array (
-      'city' => 'Moscow',
+      'city' => 'Perugia',
       'continent' => 'EU',
-      'zone' => 'RU',
-      'url' => 'ftp://mirror.yandex.ru/mageia',
+      'zone' => 'IT',
+      'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
     1 => 
     array (
-      'city' => 'Moscow',
+      'city' => 'Perugia',
       'continent' => 'EU',
-      'zone' => 'RU',
-      'url' => 'http://mirror.yandex.ru/mageia',
-    ),
-  ),
-  'CN' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Beijing',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'http://ftp.sjtu.edu.cn/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Beijing',
-      'continent' => 'AS',
-      'zone' => 'CN',
-      'url' => 'ftp://ftp.sjtu.edu.cn/mageia',
+      'zone' => 'IT',
+      'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
     ),
   ),
-); ?>
+); ?>
\ No newline at end of file