cached mirrors list udpate; adds continents as keys

1 files changed, 686 insertions, 163 deletions

diff --git a/lib/cached.list.php b/lib/cached.list.php
index 38a837667..0c99c6448 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -1,251 +1,695 @@
 <?php $mirrors = array (
-  'FR' => 
+  'US' => 
   array (
     0 => 
     array (
-      'city' => 'Paris',
-      'zone' => 'FR',
-      'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+      'city' => 'Durham',
+      'continent' => 'NA',
+      'zone' => 'US',
+      'url' => 'ftp://distro.ibiblio.org/pub/linux/distributions/mageia',
     ),
     1 => 
     array (
-      'city' => 'Lyon',
-      'zone' => 'FR',
-      'url' => 'http://fr2.rpmfind.net/linux/mageia',
+      'city' => 'Durham',
+      'continent' => 'NA',
+      'zone' => 'US',
+      'url' => 'http://distro.ibiblio.org/pub/linux/distributions/mageia',
     ),
     2 => 
     array (
-      'city' => 'Paris',
-      'zone' => 'FR',
-      'url' => 'ftp://mageia.r0b0t.fr/linux/Mageia',
+      'city' => '?',
+      'continent' => 'NA',
+      'zone' => 'US',
+      'url' => 'ftp://mirrors.kernel.org/mageia',
     ),
     3 => 
     array (
-      'city' => 'Lyon',
-      'zone' => 'FR',
-      'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
+      'city' => '?',
+      'continent' => 'NA',
+      'zone' => 'US',
+      'url' => 'http://mirrors.kernel.org/mageia',
+    ),
+  ),
+  '_C:NA' => 
+  array (
+    0 => 
+    array (
+      'city' => 'Durham',
+      'continent' => 'NA',
+      'zone' => 'US',
+      'url' => 'ftp://distro.ibiblio.org/pub/linux/distributions/mageia',
+    ),
+    1 => 
+    array (
+      'city' => 'Durham',
+      'continent' => 'NA',
+      'zone' => 'US',
+      'url' => 'http://distro.ibiblio.org/pub/linux/distributions/mageia',
+    ),
+    2 => 
+    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 => 
     array (
-      'city' => 'Vitry-sur-Seine',
-      'zone' => 'FR',
-      'url' => 'ftp://twiska.zarb.org/mageia',
+      'city' => '?',
+      'continent' => 'NA',
+      'zone' => 'US',
+      'url' => 'http://mirrors.kernel.org/mageia',
     ),
     5 => 
     array (
-      'city' => 'Vitry-sur-Seine',
-      'zone' => 'FR',
-      'url' => 'http://twiska.zarb.org/mageia',
+      'city' => 'Toronto',
+      'continent' => 'NA',
+      'zone' => 'CA',
+      'url' => 'ftp://mageia.webconquest.com',
     ),
-    6 => 
+  ),
+  'AU' => 
+  array (
+    0 => 
     array (
-      'city' => 'Paris',
-      'zone' => 'FR',
-      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+      'city' => 'Brisbane',
+      'continent' => 'OC',
+      'zone' => 'AU',
+      'url' => 'ftp://mirror.aarnet.edu.au/pub/mageia',
     ),
-    7 => 
+    1 => 
     array (
-      'city' => 'Paris',
-      'zone' => 'FR',
-      'url' => 'http://mageia.r0b0t.fr/linux/Mageia',
+      'city' => 'Brisbane',
+      'continent' => 'OC',
+      'zone' => 'AU',
+      'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
     ),
   ),
-  'CA' => 
+  '_C:OC' => 
   array (
     0 => 
     array (
-      'city' => 'Toronto',
-      'zone' => 'CA',
-      'url' => 'ftp://mageia.webconquest.com',
+      'city' => 'Brisbane',
+      'continent' => 'OC',
+      'zone' => 'AU',
+      'url' => 'ftp://mirror.aarnet.edu.au/pub/mageia',
     ),
     1 => 
     array (
-      'city' => 'Toronto',
-      'zone' => 'CA',
-      'url' => 'http://mageia.webconquest.com',
+      'city' => 'Nouméa',
+      'continent' => 'OC',
+      'zone' => 'NC',
+      'url' => 'ftp://mageia.nautile.nc/mageia',
+    ),
+    2 => 
+    array (
+      'city' => 'Brisbane',
+      'continent' => 'OC',
+      'zone' => 'AU',
+      'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
+    ),
+    3 => 
+    array (
+      'city' => 'Nouméa',
+      'continent' => 'OC',
+      'zone' => 'NC',
+      'url' => 'http://mageia.nautile.nc/mageia',
     ),
   ),
-  'CZ' => 
+  'NL' => 
   array (
     0 => 
     array (
-      'city' => '?',
-      'zone' => 'CZ',
-      'url' => 'ftp://ftp.sh.cvut.cz/MIRRORS/mageia',
+      'city' => 'Amsterdam',
+      'continent' => 'EU',
+      'zone' => 'NL',
+      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
     1 => 
     array (
-      'city' => 'Brno',
-      'zone' => 'CZ',
-      'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
+      'city' => 'Amsterdam',
+      'continent' => 'EU',
+      'zone' => 'NL',
+      'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+    ),
+  ),
+  '_C:EU' => 
+  array (
+    0 => 
+    array (
+      'city' => 'Amsterdam',
+      'continent' => 'EU',
+      'zone' => 'NL',
+      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+    ),
+    1 => 
+    array (
+      'city' => 'Brussels',
+      'continent' => 'EU',
+      'zone' => 'BE',
+      'url' => 'ftp://ftp.belnet.be/mirror/mageia',
     ),
     2 => 
     array (
+      'city' => '?',
+      'continent' => 'EU',
+      'zone' => 'PL',
+      'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
+    ),
+    3 => 
+    array (
       'city' => 'Brno',
+      'continent' => 'EU',
       'zone' => 'CZ',
       'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    3 => 
+    4 => 
+    array (
+      'city' => 'Esslingen',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
+    ),
+    5 => 
+    array (
+      'city' => 'Göttingen',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
+    ),
+    6 => 
+    array (
+      'city' => 'Göttingen',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
+    ),
+    7 => 
+    array (
+      'city' => '?',
+      'continent' => 'EU',
+      'zone' => 'SE',
+      'url' => 'ftp://ftp.acc.umu.se/mirror/mageia',
+    ),
+    8 => 
+    array (
+      'city' => 'Heraklion',
+      'continent' => 'EU',
+      'zone' => 'GR',
+      'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
+    ),
+    9 => 
+    array (
+      'city' => 'Vitry-sur-Seine',
+      'continent' => 'EU',
+      'zone' => 'FR',
+      'url' => 'http://twiska.zarb.org/mageia',
+    ),
+    10 => 
+    array (
+      'city' => 'Brno',
+      'continent' => 'EU',
+      'zone' => 'CZ',
+      'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
+    ),
+    11 => 
     array (
       'city' => 'Prague',
+      'continent' => 'EU',
       'zone' => 'CZ',
       'url' => 'ftp://mageia.mirror.dkm.cz/pub/mageia',
     ),
-    4 => 
+    12 => 
     array (
       'city' => '?',
+      'continent' => 'EU',
       'zone' => 'CZ',
       'url' => 'http://mageia.supp.name',
     ),
-    5 => 
+    13 => 
+    array (
+      'city' => 'Paris',
+      'continent' => 'EU',
+      'zone' => 'FR',
+      'url' => 'ftp://mageia.r0b0t.fr/linux/Mageia',
+    ),
+    14 => 
     array (
       'city' => 'Prague',
+      'continent' => 'EU',
       'zone' => 'CZ',
       'url' => 'http://mageia.mirror.dkm.cz/pub/mageia',
     ),
-    6 => 
+    15 => 
+    array (
+      'city' => 'geneva',
+      'continent' => 'EU',
+      'zone' => 'CH',
+      'url' => 'http://mageia.unige.ch/mirror',
+    ),
+    16 => 
+    array (
+      'city' => 'Lucern',
+      'continent' => 'EU',
+      'zone' => 'CH',
+      'url' => 'ftp://ftp.LinuxCabal.org/pub/mirrors/Mageia',
+    ),
+    17 => 
+    array (
+      'city' => 'Erfurt',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'http://ftp.mandrivauser.de/mirrors/Mageia',
+    ),
+    18 => 
+    array (
+      'city' => 'Minsk',
+      'continent' => 'EU',
+      'zone' => 'BY',
+      'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
+    ),
+    19 => 
+    array (
+      'city' => 'Amsterdam',
+      'continent' => 'EU',
+      'zone' => 'NL',
+      'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+    ),
+    20 => 
+    array (
+      'city' => 'Paris',
+      'continent' => 'EU',
+      'zone' => 'FR',
+      'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+    ),
+    21 => 
+    array (
+      'city' => 'Erfurt',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'ftp://ftp.mandrivauser.de/mirrors/Mageia',
+    ),
+    22 => 
+    array (
+      'city' => '?',
+      'continent' => 'EU',
+      'zone' => 'CZ',
+      'url' => 'ftp://ftp.sh.cvut.cz/MIRRORS/mageia',
+    ),
+    23 => 
+    array (
+      'city' => 'Esslingen',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
+    ),
+    24 => 
+    array (
+      'city' => 'Vitry-sur-Seine',
+      'continent' => 'EU',
+      'zone' => 'FR',
+      'url' => 'ftp://twiska.zarb.org/mageia',
+    ),
+    25 => 
+    array (
+      'city' => 'Brussels',
+      'continent' => 'EU',
+      'zone' => 'BE',
+      'url' => 'http://ftp.belnet.be/mirror/mageia',
+    ),
+    26 => 
+    array (
+      'city' => 'Erlangen',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
+    ),
+    27 => 
+    array (
+      'city' => 'Erlangen',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
+    ),
+    28 => 
+    array (
+      'city' => 'Paris',
+      'continent' => 'EU',
+      'zone' => 'FR',
+      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+    ),
+    29 => 
     array (
       'city' => '?',
+      'continent' => 'EU',
+      'zone' => 'SE',
+      'url' => 'http://ftp.acc.umu.se/mirror/mageia',
+    ),
+    30 => 
+    array (
+      'city' => 'Moscow',
+      'continent' => 'EU',
+      'zone' => 'RU',
+      'url' => 'http://mirror.yandex.ru/mageia',
+    ),
+    31 => 
+    array (
+      'city' => '?',
+      'continent' => 'EU',
       'zone' => 'CZ',
       'url' => 'http://ftp.sh.cvut.cz/MIRRORS/mageia',
     ),
+    32 => 
+    array (
+      'city' => 'Minsk',
+      'continent' => 'EU',
+      'zone' => 'BY',
+      'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org',
+    ),
+    33 => 
+    array (
+      'city' => 'Lyon',
+      'continent' => 'EU',
+      'zone' => 'FR',
+      'url' => 'http://fr2.rpmfind.net/linux/mageia',
+    ),
+    34 => 
+    array (
+      'city' => '?',
+      'continent' => 'EU',
+      'zone' => 'PL',
+      'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
+    ),
+    35 => 
+    array (
+      'city' => 'Heraklion',
+      'continent' => 'EU',
+      'zone' => 'GR',
+      'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
+    ),
+    36 => 
+    array (
+      'city' => 'Lyon',
+      'continent' => 'EU',
+      'zone' => 'FR',
+      'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
+    ),
+    37 => 
+    array (
+      'city' => 'Paris',
+      'continent' => 'EU',
+      'zone' => 'FR',
+      'url' => 'http://mageia.r0b0t.fr/linux/Mageia',
+    ),
+    38 => 
+    array (
+      'city' => 'Moscow',
+      'continent' => 'EU',
+      'zone' => 'RU',
+      'url' => 'ftp://mirror.yandex.ru/mageia',
+    ),
+  ),
+  'BE' => 
+  array (
+    0 => 
+    array (
+      'city' => 'Brussels',
+      'continent' => 'EU',
+      'zone' => 'BE',
+      'url' => 'ftp://ftp.belnet.be/mirror/mageia',
+    ),
+    1 => 
+    array (
+      'city' => 'Brussels',
+      'continent' => 'EU',
+      'zone' => 'BE',
+      'url' => 'http://ftp.belnet.be/mirror/mageia',
+    ),
   ),
   'TW' => 
   array (
     0 => 
     array (
       'city' => 'HsinChu',
+      'continent' => 'AS',
       'zone' => 'TW',
       'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
     1 => 
     array (
       'city' => 'HsinChu',
+      'continent' => 'AS',
       'zone' => 'TW',
-      'url' => 'http://ftp.twaren.net/Linux/Mageia',
+      'url' => 'http://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://free.nchc.org.tw/mageia',
+      'url' => 'http://ftp.twaren.net/Linux/Mageia',
     ),
   ),
-  'DE' => 
+  '_C:AS' => 
   array (
     0 => 
     array (
-      'city' => 'Göttingen',
-      'zone' => 'DE',
-      'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
+      'city' => 'HsinChu',
+      'continent' => 'AS',
+      'zone' => 'TW',
+      'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
     1 => 
     array (
-      'city' => 'Göttingen',
-      'zone' => 'DE',
-      'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
+      'city' => 'HsinChu',
+      'continent' => 'AS',
+      'zone' => 'TW',
+      'url' => 'http://free.nchc.org.tw/mageia',
     ),
     2 => 
     array (
-      'city' => 'Esslingen',
-      'zone' => 'DE',
-      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
+      'city' => 'Yonezawa',
+      'continent' => 'AS',
+      'zone' => 'JP',
+      'url' => 'ftp://ftp.yz.yamagata-u.ac.jp/pub/linux/mageia',
     ),
     3 => 
     array (
-      'city' => 'Erfurt',
-      'zone' => 'DE',
-      'url' => 'ftp://ftp.mandrivauser.de/mirrors/Mageia',
+      'city' => 'HsinChu',
+      'continent' => 'AS',
+      'zone' => 'TW',
+      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
     4 => 
     array (
-      'city' => 'Esslingen',
-      'zone' => 'DE',
-      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
+      'city' => 'Yonezawa',
+      'continent' => 'AS',
+      'zone' => 'JP',
+      'url' => 'http://ftp.yz.yamagata-u.ac.jp/pub/linux/mageia',
     ),
     5 => 
     array (
-      'city' => 'Erlangen',
-      'zone' => 'DE',
-      'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
+      'city' => 'HsinChu',
+      'continent' => 'AS',
+      'zone' => 'TW',
+      'url' => 'http://ftp.twaren.net/Linux/Mageia',
     ),
     6 => 
     array (
-      'city' => 'Erfurt',
-      'zone' => 'DE',
-      'url' => 'http://ftp.mandrivauser.de/mirrors/Mageia',
+      'city' => 'Bandung',
+      'continent' => 'AS',
+      'zone' => 'ID',
+      'url' => 'ftp://ftp.itb.ac.id/pub/mageia',
     ),
     7 => 
     array (
-      'city' => 'Erlangen',
-      'zone' => 'DE',
-      'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
+      'city' => 'Beijing',
+      'continent' => 'AS',
+      'zone' => 'CN',
+      'url' => 'ftp://ftp.sjtu.edu.cn/mageia',
+    ),
+    8 => 
+    array (
+      'city' => 'Beijing',
+      'continent' => 'AS',
+      'zone' => 'CN',
+      'url' => 'http://ftp.sjtu.edu.cn/mageia',
     ),
   ),
-  'SE' => 
+  'PL' => 
   array (
     0 => 
     array (
       'city' => '?',
-      'zone' => 'SE',
-      'url' => 'ftp://ftp.acc.umu.se/mirror/mageia',
+      'continent' => 'EU',
+      'zone' => 'PL',
+      'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
     1 => 
     array (
       'city' => '?',
-      'zone' => 'SE',
-      'url' => 'http://ftp.acc.umu.se/mirror/mageia',
+      'continent' => 'EU',
+      'zone' => 'PL',
+      'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
   ),
-  'BR' => 
+  'CZ' => 
   array (
     0 => 
     array (
-      'city' => '?',
-      'zone' => 'BR',
-      'url' => 'ftp://mageia.c3sl.ufpr.br/mageia',
+      'city' => 'Brno',
+      'continent' => 'EU',
+      'zone' => 'CZ',
+      'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
     ),
     1 => 
     array (
+      'city' => 'Brno',
+      'continent' => 'EU',
+      'zone' => 'CZ',
+      'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
+    ),
+    2 => 
+    array (
+      'city' => 'Prague',
+      'continent' => 'EU',
+      'zone' => 'CZ',
+      'url' => 'ftp://mageia.mirror.dkm.cz/pub/mageia',
+    ),
+    3 => 
+    array (
       'city' => '?',
-      'zone' => 'BR',
-      'url' => 'http://mageia.c3sl.ufpr.br',
+      'continent' => 'EU',
+      'zone' => 'CZ',
+      'url' => 'http://mageia.supp.name',
+    ),
+    4 => 
+    array (
+      'city' => 'Prague',
+      'continent' => 'EU',
+      'zone' => 'CZ',
+      'url' => 'http://mageia.mirror.dkm.cz/pub/mageia',
+    ),
+    5 => 
+    array (
+      'city' => '?',
+      'continent' => 'EU',
+      'zone' => 'CZ',
+      'url' => 'ftp://ftp.sh.cvut.cz/MIRRORS/mageia',
+    ),
+    6 => 
+    array (
+      'city' => '?',
+      'continent' => 'EU',
+      'zone' => 'CZ',
+      'url' => 'http://ftp.sh.cvut.cz/MIRRORS/mageia',
     ),
   ),
-  'ID' => 
+  'NC' => 
   array (
     0 => 
     array (
-      'city' => 'Bandung',
-      'zone' => 'ID',
-      'url' => 'http://ftp.itb.ac.id/pub/mageia',
+      'city' => 'Nouméa',
+      'continent' => 'OC',
+      'zone' => 'NC',
+      'url' => 'ftp://mageia.nautile.nc/mageia',
     ),
     1 => 
     array (
-      'city' => 'Bandung',
-      'zone' => 'ID',
-      'url' => 'ftp://ftp.itb.ac.id/pub/mageia',
+      'city' => 'Nouméa',
+      'continent' => 'OC',
+      'zone' => 'NC',
+      'url' => 'http://mageia.nautile.nc/mageia',
     ),
   ),
-  'PL' => 
+  'DE' => 
+  array (
+    0 => 
+    array (
+      'city' => 'Esslingen',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
+    ),
+    1 => 
+    array (
+      'city' => 'Göttingen',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
+    ),
+    2 => 
+    array (
+      'city' => 'Göttingen',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
+    ),
+    3 => 
+    array (
+      'city' => 'Erfurt',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'http://ftp.mandrivauser.de/mirrors/Mageia',
+    ),
+    4 => 
+    array (
+      'city' => 'Erfurt',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'ftp://ftp.mandrivauser.de/mirrors/Mageia',
+    ),
+    5 => 
+    array (
+      'city' => 'Esslingen',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/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',
+    ),
+  ),
+  'SE' => 
   array (
     0 => 
     array (
       'city' => '?',
-      'zone' => 'PL',
-      'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
+      'continent' => 'EU',
+      'zone' => 'SE',
+      'url' => 'ftp://ftp.acc.umu.se/mirror/mageia',
     ),
     1 => 
     array (
       'city' => '?',
-      'zone' => 'PL',
-      'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
+      'continent' => 'EU',
+      'zone' => 'SE',
+      'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
   ),
   'GR' => 
@@ -253,38 +697,75 @@
     0 => 
     array (
       'city' => 'Heraklion',
+      'continent' => 'EU',
       'zone' => 'GR',
-      'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
+      'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
     1 => 
     array (
       'city' => 'Heraklion',
+      'continent' => 'EU',
       'zone' => 'GR',
-      'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
+      'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
   ),
-  'NC' => 
+  'FR' => 
   array (
     0 => 
     array (
-      'city' => 'Nouméa',
-      'zone' => 'NC',
-      'url' => 'http://mageia.nautile.nc/mageia',
+      'city' => 'Vitry-sur-Seine',
+      'continent' => 'EU',
+      'zone' => 'FR',
+      'url' => 'http://twiska.zarb.org/mageia',
     ),
     1 => 
     array (
-      'city' => 'Nouméa',
-      'zone' => 'NC',
-      'url' => 'ftp://mageia.nautile.nc/mageia',
+      'city' => 'Paris',
+      'continent' => 'EU',
+      'zone' => 'FR',
+      'url' => 'ftp://mageia.r0b0t.fr/linux/Mageia',
     ),
-  ),
-  'CN' => 
-  array (
-    0 => 
+    2 => 
     array (
-      'city' => 'Beijing',
-      'zone' => 'CN',
-      'url' => 'http://fundawang.lcuc.org.cn/mageia',
+      'city' => 'Paris',
+      'continent' => 'EU',
+      'zone' => 'FR',
+      'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+    ),
+    3 => 
+    array (
+      'city' => 'Vitry-sur-Seine',
+      'continent' => 'EU',
+      'zone' => 'FR',
+      'url' => 'ftp://twiska.zarb.org/mageia',
+    ),
+    4 => 
+    array (
+      'city' => 'Paris',
+      'continent' => 'EU',
+      'zone' => 'FR',
+      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+    ),
+    5 => 
+    array (
+      'city' => 'Lyon',
+      'continent' => 'EU',
+      'zone' => 'FR',
+      'url' => 'http://fr2.rpmfind.net/linux/mageia',
+    ),
+    6 => 
+    array (
+      'city' => 'Lyon',
+      'continent' => 'EU',
+      'zone' => 'FR',
+      'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
+    ),
+    7 => 
+    array (
+      'city' => 'Paris',
+      'continent' => 'EU',
+      'zone' => 'FR',
+      'url' => 'http://mageia.r0b0t.fr/linux/Mageia',
     ),
   ),
   'JP' => 
@@ -292,116 +773,156 @@
     0 => 
     array (
       'city' => 'Yonezawa',
+      'continent' => 'AS',
       'zone' => 'JP',
-      'url' => 'http://ftp.yz.yamagata-u.ac.jp/pub/linux/mageia',
+      'url' => 'ftp://ftp.yz.yamagata-u.ac.jp/pub/linux/mageia',
     ),
     1 => 
     array (
       'city' => 'Yonezawa',
+      'continent' => 'AS',
       'zone' => 'JP',
-      'url' => 'ftp://ftp.yz.yamagata-u.ac.jp/pub/linux/mageia',
+      'url' => 'http://ftp.yz.yamagata-u.ac.jp/pub/linux/mageia',
     ),
   ),
-  'BY' => 
+  'CH' => 
   array (
     0 => 
     array (
-      'city' => 'Minsk',
-      'zone' => 'BY',
-      'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org',
+      'city' => 'geneva',
+      'continent' => 'EU',
+      'zone' => 'CH',
+      'url' => 'http://mageia.unige.ch/mirror',
     ),
     1 => 
     array (
-      'city' => 'Minsk',
-      'zone' => 'BY',
-      'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
+      'city' => 'Lucern',
+      'continent' => 'EU',
+      'zone' => 'CH',
+      'url' => 'ftp://ftp.LinuxCabal.org/pub/mirrors/Mageia',
     ),
   ),
-  'NL' => 
+  'CA' => 
   array (
     0 => 
     array (
-      'city' => 'Amsterdam',
-      'zone' => 'NL',
-      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+      'city' => 'Toronto',
+      'continent' => 'NA',
+      'zone' => 'CA',
+      'url' => 'http://mageia.webconquest.com',
     ),
     1 => 
     array (
-      'city' => 'Amsterdam',
-      'zone' => 'NL',
-      'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+      'city' => 'Toronto',
+      'continent' => 'NA',
+      'zone' => 'CA',
+      'url' => 'ftp://mageia.webconquest.com',
     ),
   ),
-  'AU' => 
+  'ID' => 
   array (
     0 => 
     array (
-      'city' => 'Brisbane',
-      'zone' => 'AU',
-      'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Brisbane',
-      'zone' => 'AU',
-      'url' => 'ftp://mirror.aarnet.edu.au/pub/mageia',
+      'city' => 'Bandung',
+      'continent' => 'AS',
+      'zone' => 'ID',
+      'url' => 'ftp://ftp.itb.ac.id/pub/mageia',
     ),
   ),
-  'CH' => 
+  'BR' => 
   array (
     0 => 
     array (
-      'city' => 'Lucern',
-      'zone' => 'CH',
-      'url' => 'ftp://ftp.LinuxCabal.org/pub/mirrors/Mageia',
+      'city' => '?',
+      'continent' => 'SA',
+      'zone' => 'BR',
+      'url' => 'http://mageia.c3sl.ufpr.br',
     ),
     1 => 
     array (
-      'city' => 'geneva',
-      'zone' => 'CH',
-      'url' => 'http://mageia.unige.ch/mirror',
+      'city' => '?',
+      'continent' => 'SA',
+      'zone' => 'BR',
+      'url' => 'ftp://mageia.c3sl.ufpr.br/mageia',
+    ),
+    2 => 
+    array (
+      'city' => 'Brasilia',
+      'continent' => 'SA',
+      'zone' => 'BR',
+      'url' => 'ftp://mageia.fis.unb.br/mageia',
+    ),
+    3 => 
+    array (
+      'city' => 'Brasilia',
+      'continent' => 'SA',
+      'zone' => 'BR',
+      'url' => 'http://mageia.fis.unb.br',
     ),
   ),
-  'US' => 
+  '_C:SA' => 
   array (
     0 => 
     array (
       'city' => '?',
-      'zone' => 'US',
-      'url' => 'http://mirrors.kernel.org/mageia',
+      'continent' => 'SA',
+      'zone' => 'BR',
+      'url' => 'http://mageia.c3sl.ufpr.br',
     ),
     1 => 
     array (
-      'city' => 'Durham',
-      'zone' => 'US',
-      'url' => 'http://distro.ibiblio.org/pub/linux/distributions/mageia',
+      'city' => '?',
+      'continent' => 'SA',
+      'zone' => 'BR',
+      'url' => 'ftp://mageia.c3sl.ufpr.br/mageia',
     ),
     2 => 
     array (
-      'city' => 'Durham',
-      'zone' => 'US',
-      'url' => 'ftp://distro.ibiblio.org/pub/linux/distributions/mageia',
+      'city' => 'Brasilia',
+      'continent' => 'SA',
+      'zone' => 'BR',
+      'url' => 'ftp://mageia.fis.unb.br/mageia',
     ),
     3 => 
     array (
-      'city' => '?',
-      'zone' => 'US',
-      'url' => 'ftp://mirrors.kernel.org/mageia',
+      'city' => 'Brasilia',
+      'continent' => 'SA',
+      'zone' => 'BR',
+      'url' => 'http://mageia.fis.unb.br',
     ),
   ),
-  'BE' => 
+  'BY' => 
   array (
     0 => 
     array (
-      'city' => 'Brussels',
-      'zone' => 'BE',
-      'url' => 'ftp://ftp.belnet.be/mirror/mageia',
+      'city' => 'Minsk',
+      'continent' => 'EU',
+      'zone' => 'BY',
+      'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
     1 => 
     array (
-      'city' => 'Brussels',
-      'zone' => 'BE',
-      'url' => 'http://ftp.belnet.be/mirror/mageia',
+      'city' => 'Minsk',
+      'continent' => 'EU',
+      'zone' => 'BY',
+      'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org',
+    ),
+  ),
+  'CN' => 
+  array (
+    0 => 
+    array (
+      'city' => 'Beijing',
+      'continent' => 'AS',
+      'zone' => 'CN',
+      'url' => 'ftp://ftp.sjtu.edu.cn/mageia',
+    ),
+    1 => 
+    array (
+      'city' => 'Beijing',
+      'continent' => 'AS',
+      'zone' => 'CN',
+      'url' => 'http://ftp.sjtu.edu.cn/mageia',
     ),
   ),
   'RU' => 
@@ -409,12 +930,14 @@
     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',
     ),