refresh cache lists

3 files changed, 268 insertions, 691 deletions

diff --git a/lib/cached.list.php b/lib/cached.list.php
index aa54216ca..82a8787ae 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -8,6 +8,13 @@
       'city' => 'Stellenbosch',
       'url' => 'ftp://ftp.sun.ac.za/pub/mirrors/mageia',
     ),
+    1 => 
+    array (
+      'zone' => 'ZA',
+      'country' => 'ZA',
+      'city' => 'Stellenbosch',
+      'url' => 'http://ftp.sun.ac.za/ftp/pub/mirrors/mageia',
+    ),
   ),
   '_C:AS' => 
   array (
@@ -55,103 +62,61 @@
     ),
     6 => 
     array (
-      'zone' => 'IL',
-      'country' => 'IL',
-      'city' => '-',
-      'url' => 'http://mirror.isoc.org.il/pub/mageia',
-    ),
-    7 => 
-    array (
-      'zone' => 'IL',
-      'country' => 'IL',
-      'city' => '-',
-      'url' => 'https://mirror.isoc.org.il/pub/mageia',
-    ),
-    8 => 
-    array (
       'zone' => 'IN',
       'country' => 'IN',
       'city' => 'Jaipur',
       'url' => 'http://mirrors.nju.edu.cn/mageia',
     ),
-    9 => 
+    7 => 
     array (
       'zone' => 'IN',
       'country' => 'IN',
       'city' => 'Jaipur',
       'url' => 'https://mirrors.nju.edu.cn/mageia',
     ),
-    10 => 
+    8 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    11 => 
+    9 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'https://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    12 => 
+    10 => 
     array (
-      'zone' => 'PH',
-      'country' => 'PH',
-      'city' => 'Cebu',
-      'url' => 'http://mirror.rise.ph/mageia',
+      'zone' => 'JP',
+      'country' => 'JP',
+      'city' => 'Yonezawa',
+      'url' => 'http://ftp.yz.yamagata-u.ac.jp/pub/Linux/mageia',
     ),
-    13 => 
+    11 => 
     array (
-      'zone' => 'TR',
-      'country' => 'TR',
-      'city' => 'Ankara',
-      'url' => 'ftp://ftp.linux.org.tr/mageia',
+      'zone' => 'JP',
+      'country' => 'JP',
+      'city' => 'Yonezawa',
+      'url' => 'https://ftp.yz.yamagata-u.ac.jp/pub/Linux/mageia',
     ),
-    14 => 
+    12 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    15 => 
+    13 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'https://ftp.linux.org.tr/mageia',
     ),
-    16 => 
-    array (
-      'zone' => 'TR',
-      'country' => 'TR',
-      'city' => 'istanbul',
-      'url' => 'https://mirror.rabisu.com/mageia',
-    ),
-    17 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'ftp://free.nchc.org.tw/mageia',
-    ),
-    18 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
-    ),
-    19 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'http://free.nchc.org.tw/mageia',
-    ),
-    20 => 
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -177,453 +142,369 @@
     ),
     2 => 
     array (
+      'zone' => 'BE',
+      'country' => 'BE',
+      'city' => 'Leuven',
+      'url' => 'http://mageia.mirror-services.net/pub',
+    ),
+    3 => 
+    array (
+      'zone' => 'BE',
+      'country' => 'BE',
+      'city' => 'Leuven',
+      'url' => 'https://mageia.mirror-services.net/pub',
+    ),
+    4 => 
+    array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'ftp://mirrors.neterra.net/mageia',
     ),
-    3 => 
+    5 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'ftp://mirrors.netix.net/mageia',
     ),
-    4 => 
+    6 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'http://mirrors.neterra.net/mageia',
     ),
-    5 => 
+    7 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'http://mirrors.netix.net/mageia',
     ),
-    6 => 
+    8 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'https://mirrors.neterra.net/mageia',
     ),
-    7 => 
+    9 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'https://mirrors.netix.net/mageia',
     ),
-    8 => 
-    array (
-      'zone' => 'BY',
-      'country' => 'BY',
-      'city' => 'Minsk',
-      'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org',
-    ),
-    9 => 
-    array (
-      'zone' => 'BY',
-      'country' => 'BY',
-      'city' => 'Minsk',
-      'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
-    ),
     10 => 
     array (
-      'zone' => 'BY',
-      'country' => 'BY',
-      'city' => 'Minsk',
-      'url' => 'https://mirror.datacenter.by/pub/mirrors/mageia.org',
-    ),
-    11 => 
-    array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    12 => 
+    11 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    13 => 
+    12 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'https://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    14 => 
+    13 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'http://ftp.fau.de/mageia',
     ),
-    15 => 
+    14 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'https://ftp.fau.de/mageia',
     ),
-    16 => 
+    15 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Falkenstein',
       'url' => 'http://mirrors.cicku.me/mageia',
     ),
-    17 => 
+    16 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Falkenstein',
       'url' => 'https://mirrors.cicku.me/mageia',
     ),
-    18 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Falkenstein/Vogtl.',
-      'url' => 'ftp://mirror2.tuxinator.org/mageia',
-    ),
-    19 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Falkenstein/Vogtl.',
-      'url' => 'http://mirror2.tuxinator.org/mageia',
-    ),
-    20 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Falkenstein/Vogtl.',
-      'url' => 'https://mirror2.tuxinator.org/mageia',
-    ),
-    21 => 
+    17 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    22 => 
+    18 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    23 => 
+    19 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'https://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    24 => 
+    20 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Schneverdingen',
       'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    25 => 
+    21 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Schneverdingen',
       'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    26 => 
+    22 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Schneverdingen',
       'url' => 'https://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    27 => 
+    23 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    28 => 
+    24 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'https://fr2.rpmfind.net/linux/mageia',
     ),
-    29 => 
+    25 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Ons-en-Bray',
       'url' => 'ftp://geex.freeboxos.fr',
     ),
-    30 => 
-    array (
-      'zone' => 'FR',
-      'country' => 'FR',
-      'city' => 'Ons-en-Bray',
-      'url' => 'http://geex.freeboxos.fr',
-    ),
-    31 => 
+    26 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    32 => 
+    27 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://ftp.proxad.net/mirrors/mageia.org',
     ),
-    33 => 
+    28 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    34 => 
+    29 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    35 => 
+    30 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://ftp.proxad.net/mirrors/mageia.org',
     ),
-    36 => 
+    31 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'https://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    37 => 
+    32 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    38 => 
+    33 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    39 => 
+    34 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'https://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    40 => 
-    array (
-      'zone' => 'HU',
-      'country' => 'HU',
-      'city' => 'Miskolc',
-      'url' => 'http://quantum-mirror.hu/mirrors/pub/mageia',
-    ),
-    41 => 
-    array (
-      'zone' => 'HU',
-      'country' => 'HU',
-      'city' => 'Miskolc',
-      'url' => 'https://quantum-mirror.hu/mirrors/pub/mageia',
-    ),
-    42 => 
-    array (
-      'zone' => 'IT',
-      'country' => 'IT',
-      'city' => 'Milan',
-      'url' => 'http://vodka.sublink.org/mageia',
-    ),
-    43 => 
+    35 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    44 => 
+    36 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'https://mageia.mirror.garr.it/mageia',
     ),
-    45 => 
+    37 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    46 => 
+    38 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    47 => 
+    39 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    48 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Den Haag',
-      'url' => 'http://mirror.serverion.com/mageia',
-    ),
-    49 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Enschede',
-      'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
-    ),
-    50 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Enschede',
-      'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
-    ),
-    51 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Enschede',
-      'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
-    ),
-    52 => 
+    40 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    53 => 
+    41 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    54 => 
+    42 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    55 => 
+    43 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    56 => 
+    44 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'https://mirror.yandex.ru/mageia',
     ),
-    57 => 
+    45 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://mirror.accum.se/mirror/mageia',
     ),
-    58 => 
+    46 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'https://mirror.accum.se/mirror/mageia',
     ),
-    59 => 
+    47 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Kyiv',
       'url' => 'http://distrohub.kyiv.ua/mageia',
     ),
-    60 => 
+    48 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Kyiv',
       'url' => 'https://distrohub.kyiv.ua/mageia',
     ),
-    61 => 
+    49 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.info/mirror/mageia',
     ),
-    62 => 
+    50 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    63 => 
+    51 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.info',
     ),
-    64 => 
+    52 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.vn.ua',
     ),
-    65 => 
+    53 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'https://mageia.ip-connect.info',
     ),
-    66 => 
+    54 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -651,38 +532,17 @@
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Durham',
-      'url' => 'http://distro.ibiblio.org/mageia',
+      'city' => 'Portland',
+      'url' => 'https://us.mirrors.cicku.me/mageia',
     ),
     3 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Durham',
-      'url' => 'https://distro.ibiblio.org/mageia',
-    ),
-    4 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Las Vegas',
-      'url' => 'ftp://ftp.mageia-highland.us',
-    ),
-    5 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Las Vegas',
-      'url' => 'http://ftp.mageia-highland.us/mageia',
-    ),
-    6 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
       'city' => 'Princeton',
       'url' => 'http://mirror.math.princeton.edu/pub/mageia',
     ),
-    7 => 
+    4 => 
     array (
       'zone' => 'US',
       'country' => 'US',
@@ -707,42 +567,4 @@
       'url' => 'https://mirror.aarnet.edu.au/pub/mageia',
     ),
   ),
-  '_C:SA' => 
-  array (
-    0 => 
-    array (
-      'zone' => 'BR',
-      'country' => 'BR',
-      'city' => '-',
-      'url' => 'http://mageia.c3sl.ufpr.br',
-    ),
-    1 => 
-    array (
-      'zone' => 'BR',
-      'country' => 'BR',
-      'city' => '-',
-      'url' => 'https://mageia.c3sl.ufpr.br',
-    ),
-    2 => 
-    array (
-      'zone' => 'EC',
-      'country' => 'EC',
-      'city' => 'Cuenca',
-      'url' => 'ftp://mirror.cedia.org.ec/mageia',
-    ),
-    3 => 
-    array (
-      'zone' => 'EC',
-      'country' => 'EC',
-      'city' => 'Cuenca',
-      'url' => 'http://mirror.cedia.org.ec/mageia',
-    ),
-    4 => 
-    array (
-      'zone' => 'EC',
-      'country' => 'EC',
-      'city' => 'Cuenca',
-      'url' => 'https://mirror.cedia.org.ec/mageia',
-    ),
-  ),
 ); ?>
diff --git a/lib/cached.list_doc.php b/lib/cached.list_doc.php
index 245ef6490..bb14dba40 100644
--- a/lib/cached.list_doc.php
+++ b/lib/cached.list_doc.php
@@ -90,39 +90,39 @@
     ),
     10 => 
     array (
-      'zone' => 'PH',
-      'country' => 'PH',
-      'city' => 'Cebu',
-      'url' => 'http://mirror.rise.ph/mageia',
+      'zone' => 'JP',
+      'country' => 'JP',
+      'city' => 'Yonezawa',
+      'url' => 'http://ftp.yz.yamagata-u.ac.jp/pub/Linux/mageia',
     ),
     11 => 
     array (
-      'zone' => 'TR',
-      'country' => 'TR',
-      'city' => 'Ankara',
-      'url' => 'ftp://ftp.linux.org.tr/mageia',
+      'zone' => 'JP',
+      'country' => 'JP',
+      'city' => 'Yonezawa',
+      'url' => 'https://ftp.yz.yamagata-u.ac.jp/pub/Linux/mageia',
     ),
     12 => 
     array (
+      'zone' => 'PH',
+      'country' => 'PH',
+      'city' => 'Cebu',
+      'url' => 'http://mirror.rise.ph/mageia',
+    ),
+    13 => 
+    array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    13 => 
+    14 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'https://ftp.linux.org.tr/mageia',
     ),
-    14 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'ftp://free.nchc.org.tw/mageia',
-    ),
     15 => 
     array (
       'zone' => 'TW',
@@ -135,13 +135,6 @@
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
-      'url' => 'http://free.nchc.org.tw/mageia',
-    ),
-    17 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
       'url' => 'https://free.nchc.org.tw/mageia',
     ),
   ),
@@ -163,453 +156,390 @@
     ),
     2 => 
     array (
+      'zone' => 'BE',
+      'country' => 'BE',
+      'city' => 'Leuven',
+      'url' => 'http://mageia.mirror-services.net/pub',
+    ),
+    3 => 
+    array (
+      'zone' => 'BE',
+      'country' => 'BE',
+      'city' => 'Leuven',
+      'url' => 'https://mageia.mirror-services.net/pub',
+    ),
+    4 => 
+    array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'ftp://mirrors.neterra.net/mageia',
     ),
-    3 => 
+    5 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'ftp://mirrors.netix.net/mageia',
     ),
-    4 => 
+    6 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'http://mirrors.neterra.net/mageia',
     ),
-    5 => 
+    7 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'http://mirrors.netix.net/mageia',
     ),
-    6 => 
+    8 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'https://mirrors.neterra.net/mageia',
     ),
-    7 => 
+    9 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'https://mirrors.netix.net/mageia',
     ),
-    8 => 
-    array (
-      'zone' => 'BY',
-      'country' => 'BY',
-      'city' => 'Minsk',
-      'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org',
-    ),
-    9 => 
-    array (
-      'zone' => 'BY',
-      'country' => 'BY',
-      'city' => 'Minsk',
-      'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
-    ),
     10 => 
     array (
-      'zone' => 'BY',
-      'country' => 'BY',
-      'city' => 'Minsk',
-      'url' => 'https://mirror.datacenter.by/pub/mirrors/mageia.org',
-    ),
-    11 => 
-    array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    12 => 
+    11 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    13 => 
+    12 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'https://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    14 => 
+    13 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'http://ftp.fau.de/mageia',
     ),
-    15 => 
+    14 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'https://ftp.fau.de/mageia',
     ),
-    16 => 
+    15 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Falkenstein',
       'url' => 'http://mirrors.cicku.me/mageia',
     ),
-    17 => 
+    16 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Falkenstein',
       'url' => 'https://mirrors.cicku.me/mageia',
     ),
-    18 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Falkenstein/Vogtl.',
-      'url' => 'ftp://mirror2.tuxinator.org/mageia',
-    ),
-    19 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Falkenstein/Vogtl.',
-      'url' => 'http://mirror2.tuxinator.org/mageia',
-    ),
-    20 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Falkenstein/Vogtl.',
-      'url' => 'https://mirror2.tuxinator.org/mageia',
-    ),
-    21 => 
+    17 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    22 => 
+    18 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    23 => 
+    19 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'https://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    24 => 
+    20 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Schneverdingen',
       'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    25 => 
+    21 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Schneverdingen',
       'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    26 => 
+    22 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Schneverdingen',
       'url' => 'https://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    27 => 
+    23 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    28 => 
+    24 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'https://fr2.rpmfind.net/linux/mageia',
     ),
-    29 => 
+    25 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Ons-en-Bray',
       'url' => 'ftp://geex.freeboxos.fr',
     ),
-    30 => 
-    array (
-      'zone' => 'FR',
-      'country' => 'FR',
-      'city' => 'Ons-en-Bray',
-      'url' => 'http://geex.freeboxos.fr',
-    ),
-    31 => 
+    26 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    32 => 
+    27 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://ftp.proxad.net/mirrors/mageia.org',
     ),
-    33 => 
+    28 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    34 => 
+    29 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    35 => 
+    30 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://ftp.proxad.net/mirrors/mageia.org',
     ),
-    36 => 
+    31 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'https://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    37 => 
+    32 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    38 => 
+    33 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    39 => 
+    34 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'https://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    40 => 
-    array (
-      'zone' => 'HU',
-      'country' => 'HU',
-      'city' => 'Miskolc',
-      'url' => 'http://quantum-mirror.hu/mirrors/pub/mageia',
-    ),
-    41 => 
-    array (
-      'zone' => 'HU',
-      'country' => 'HU',
-      'city' => 'Miskolc',
-      'url' => 'https://quantum-mirror.hu/mirrors/pub/mageia',
-    ),
-    42 => 
-    array (
-      'zone' => 'IT',
-      'country' => 'IT',
-      'city' => 'Milan',
-      'url' => 'http://vodka.sublink.org/mageia',
-    ),
-    43 => 
+    35 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    44 => 
+    36 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'https://mageia.mirror.garr.it/mageia',
     ),
-    45 => 
+    37 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    46 => 
+    38 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    47 => 
+    39 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    48 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Den Haag',
-      'url' => 'http://mirror.serverion.com/mageia',
-    ),
-    49 => 
+    40 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    50 => 
+    41 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    51 => 
+    42 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    52 => 
+    43 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    53 => 
+    44 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    54 => 
+    45 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    55 => 
+    46 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    56 => 
+    47 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'https://mirror.yandex.ru/mageia',
     ),
-    57 => 
+    48 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://mirror.accum.se/mirror/mageia',
     ),
-    58 => 
+    49 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'https://mirror.accum.se/mirror/mageia',
     ),
-    59 => 
+    50 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Kyiv',
       'url' => 'http://distrohub.kyiv.ua/mageia',
     ),
-    60 => 
+    51 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Kyiv',
       'url' => 'https://distrohub.kyiv.ua/mageia',
     ),
-    61 => 
+    52 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.info/mirror/mageia',
     ),
-    62 => 
+    53 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    63 => 
+    54 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.info',
     ),
-    64 => 
+    55 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.vn.ua',
     ),
-    65 => 
+    56 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'https://mageia.ip-connect.info',
     ),
-    66 => 
+    57 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -637,24 +567,17 @@
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Las Vegas',
-      'url' => 'ftp://ftp.mageia-highland.us',
+      'city' => 'Portland',
+      'url' => 'https://us.mirrors.cicku.me/mageia',
     ),
     3 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Las Vegas',
-      'url' => 'http://ftp.mageia-highland.us/mageia',
-    ),
-    4 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
       'city' => 'Princeton',
       'url' => 'http://mirror.math.princeton.edu/pub/mageia',
     ),
-    5 => 
+    4 => 
     array (
       'zone' => 'US',
       'country' => 'US',
@@ -668,17 +591,10 @@
     array (
       'zone' => 'AU',
       'country' => 'AU',
-      'city' => 'Adelaide',
-      'url' => 'http://mirror.internode.on.net/pub/mageia',
-    ),
-    1 => 
-    array (
-      'zone' => 'AU',
-      'country' => 'AU',
       'city' => 'Brisbane',
       'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
     ),
-    2 => 
+    1 => 
     array (
       'zone' => 'AU',
       'country' => 'AU',
@@ -702,26 +618,5 @@
       'city' => '-',
       'url' => 'https://mageia.c3sl.ufpr.br',
     ),
-    2 => 
-    array (
-      'zone' => 'EC',
-      'country' => 'EC',
-      'city' => 'Cuenca',
-      'url' => 'ftp://mirror.cedia.org.ec/mageia',
-    ),
-    3 => 
-    array (
-      'zone' => 'EC',
-      'country' => 'EC',
-      'city' => 'Cuenca',
-      'url' => 'http://mirror.cedia.org.ec/mageia',
-    ),
-    4 => 
-    array (
-      'zone' => 'EC',
-      'country' => 'EC',
-      'city' => 'Cuenca',
-      'url' => 'https://mirror.cedia.org.ec/mageia',
-    ),
   ),
 ); ?>
diff --git a/lib/cached.list_mirrorlist.php b/lib/cached.list_mirrorlist.php
index 066d05719..23f2f928f 100644
--- a/lib/cached.list_mirrorlist.php
+++ b/lib/cached.list_mirrorlist.php
@@ -29,122 +29,80 @@
     array (
       'zone' => 'CN',
       'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'https://mirrors.ustc.edu.cn/mageia',
-    ),
-    2 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'http://ftp.sjtu.edu.cn/mageia',
     ),
-    3 => 
+    2 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'https://ftp.sjtu.edu.cn/mageia',
     ),
-    4 => 
-    array (
-      'zone' => 'IL',
-      'country' => 'IL',
-      'city' => '-',
-      'url' => 'http://mirror.isoc.org.il/pub/mageia',
-    ),
-    5 => 
-    array (
-      'zone' => 'IL',
-      'country' => 'IL',
-      'city' => '-',
-      'url' => 'https://mirror.isoc.org.il/pub/mageia',
-    ),
-    6 => 
+    3 => 
     array (
       'zone' => 'IN',
       'country' => 'IN',
       'city' => 'Jaipur',
       'url' => 'http://mirrors.nju.edu.cn/mageia',
     ),
-    7 => 
+    4 => 
     array (
       'zone' => 'IN',
       'country' => 'IN',
       'city' => 'Jaipur',
       'url' => 'https://mirrors.nju.edu.cn/mageia',
     ),
-    8 => 
+    5 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    9 => 
+    6 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'https://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    10 => 
+    7 => 
+    array (
+      'zone' => 'JP',
+      'country' => 'JP',
+      'city' => 'Yonezawa',
+      'url' => 'http://ftp.yz.yamagata-u.ac.jp/pub/Linux/mageia',
+    ),
+    8 => 
+    array (
+      'zone' => 'JP',
+      'country' => 'JP',
+      'city' => 'Yonezawa',
+      'url' => 'https://ftp.yz.yamagata-u.ac.jp/pub/Linux/mageia',
+    ),
+    9 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'http://mirror.rise.ph/mageia',
     ),
-    11 => 
-    array (
-      'zone' => 'TR',
-      'country' => 'TR',
-      'city' => 'Ankara',
-      'url' => 'ftp://ftp.linux.org.tr/mageia',
-    ),
-    12 => 
+    10 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    13 => 
+    11 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'https://ftp.linux.org.tr/mageia',
     ),
-    14 => 
-    array (
-      'zone' => 'TR',
-      'country' => 'TR',
-      'city' => 'istanbul',
-      'url' => 'https://mirror.rabisu.com/mageia',
-    ),
-    15 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'ftp://free.nchc.org.tw/mageia',
-    ),
-    16 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
-    ),
-    17 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'http://free.nchc.org.tw/mageia',
-    ),
-    18 => 
+    12 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -170,453 +128,390 @@
     ),
     2 => 
     array (
+      'zone' => 'BE',
+      'country' => 'BE',
+      'city' => 'Leuven',
+      'url' => 'http://mageia.mirror-services.net/pub',
+    ),
+    3 => 
+    array (
+      'zone' => 'BE',
+      'country' => 'BE',
+      'city' => 'Leuven',
+      'url' => 'https://mageia.mirror-services.net/pub',
+    ),
+    4 => 
+    array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'ftp://mirrors.neterra.net/mageia',
     ),
-    3 => 
+    5 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'ftp://mirrors.netix.net/mageia',
     ),
-    4 => 
+    6 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'http://mirrors.neterra.net/mageia',
     ),
-    5 => 
+    7 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'http://mirrors.netix.net/mageia',
     ),
-    6 => 
+    8 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'https://mirrors.neterra.net/mageia',
     ),
-    7 => 
+    9 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'https://mirrors.netix.net/mageia',
     ),
-    8 => 
-    array (
-      'zone' => 'BY',
-      'country' => 'BY',
-      'city' => 'Minsk',
-      'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org',
-    ),
-    9 => 
-    array (
-      'zone' => 'BY',
-      'country' => 'BY',
-      'city' => 'Minsk',
-      'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
-    ),
     10 => 
     array (
-      'zone' => 'BY',
-      'country' => 'BY',
-      'city' => 'Minsk',
-      'url' => 'https://mirror.datacenter.by/pub/mirrors/mageia.org',
-    ),
-    11 => 
-    array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    12 => 
+    11 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    13 => 
+    12 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'https://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    14 => 
+    13 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'http://ftp.fau.de/mageia',
     ),
-    15 => 
+    14 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'https://ftp.fau.de/mageia',
     ),
-    16 => 
+    15 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Falkenstein',
       'url' => 'http://mirrors.cicku.me/mageia',
     ),
-    17 => 
+    16 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Falkenstein',
       'url' => 'https://mirrors.cicku.me/mageia',
     ),
-    18 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Falkenstein/Vogtl.',
-      'url' => 'ftp://mirror2.tuxinator.org/mageia',
-    ),
-    19 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Falkenstein/Vogtl.',
-      'url' => 'http://mirror2.tuxinator.org/mageia',
-    ),
-    20 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Falkenstein/Vogtl.',
-      'url' => 'https://mirror2.tuxinator.org/mageia',
-    ),
-    21 => 
+    17 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    22 => 
+    18 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    23 => 
+    19 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'https://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    24 => 
+    20 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Schneverdingen',
       'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    25 => 
+    21 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Schneverdingen',
       'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    26 => 
+    22 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Schneverdingen',
       'url' => 'https://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    27 => 
+    23 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    28 => 
+    24 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'https://fr2.rpmfind.net/linux/mageia',
     ),
-    29 => 
+    25 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Ons-en-Bray',
       'url' => 'ftp://geex.freeboxos.fr',
     ),
-    30 => 
-    array (
-      'zone' => 'FR',
-      'country' => 'FR',
-      'city' => 'Ons-en-Bray',
-      'url' => 'http://geex.freeboxos.fr',
-    ),
-    31 => 
+    26 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    32 => 
+    27 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://ftp.proxad.net/mirrors/mageia.org',
     ),
-    33 => 
+    28 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    34 => 
+    29 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    35 => 
+    30 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://ftp.proxad.net/mirrors/mageia.org',
     ),
-    36 => 
+    31 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'https://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    37 => 
+    32 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    38 => 
+    33 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    39 => 
+    34 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'https://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    40 => 
-    array (
-      'zone' => 'HU',
-      'country' => 'HU',
-      'city' => 'Miskolc',
-      'url' => 'http://quantum-mirror.hu/mirrors/pub/mageia',
-    ),
-    41 => 
-    array (
-      'zone' => 'HU',
-      'country' => 'HU',
-      'city' => 'Miskolc',
-      'url' => 'https://quantum-mirror.hu/mirrors/pub/mageia',
-    ),
-    42 => 
-    array (
-      'zone' => 'IT',
-      'country' => 'IT',
-      'city' => 'Milan',
-      'url' => 'http://vodka.sublink.org/mageia',
-    ),
-    43 => 
+    35 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    44 => 
+    36 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'https://mageia.mirror.garr.it/mageia',
     ),
-    45 => 
+    37 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    46 => 
+    38 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    47 => 
+    39 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    48 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Den Haag',
-      'url' => 'http://mirror.serverion.com/mageia',
-    ),
-    49 => 
+    40 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    50 => 
+    41 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    51 => 
+    42 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    52 => 
+    43 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    53 => 
+    44 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    54 => 
+    45 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    55 => 
+    46 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    56 => 
+    47 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'https://mirror.yandex.ru/mageia',
     ),
-    57 => 
+    48 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://mirror.accum.se/mirror/mageia',
     ),
-    58 => 
+    49 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'https://mirror.accum.se/mirror/mageia',
     ),
-    59 => 
+    50 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Kyiv',
       'url' => 'http://distrohub.kyiv.ua/mageia',
     ),
-    60 => 
+    51 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Kyiv',
       'url' => 'https://distrohub.kyiv.ua/mageia',
     ),
-    61 => 
+    52 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.info/mirror/mageia',
     ),
-    62 => 
+    53 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    63 => 
+    54 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.info',
     ),
-    64 => 
+    55 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.vn.ua',
     ),
-    65 => 
+    56 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'https://mageia.ip-connect.info',
     ),
-    66 => 
+    57 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -658,24 +553,17 @@
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Las Vegas',
-      'url' => 'ftp://ftp.mageia-highland.us',
+      'city' => 'Portland',
+      'url' => 'https://us.mirrors.cicku.me/mageia',
     ),
     5 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Las Vegas',
-      'url' => 'http://ftp.mageia-highland.us/mageia',
-    ),
-    6 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
       'city' => 'Princeton',
       'url' => 'http://mirror.math.princeton.edu/pub/mageia',
     ),
-    7 => 
+    6 => 
     array (
       'zone' => 'US',
       'country' => 'US',
@@ -689,17 +577,10 @@
     array (
       'zone' => 'AU',
       'country' => 'AU',
-      'city' => 'Adelaide',
-      'url' => 'http://mirror.internode.on.net/pub/mageia',
-    ),
-    1 => 
-    array (
-      'zone' => 'AU',
-      'country' => 'AU',
       'city' => 'Brisbane',
       'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
     ),
-    2 => 
+    1 => 
     array (
       'zone' => 'AU',
       'country' => 'AU',
@@ -723,26 +604,5 @@
       'city' => '-',
       'url' => 'https://mageia.c3sl.ufpr.br',
     ),
-    2 => 
-    array (
-      'zone' => 'EC',
-      'country' => 'EC',
-      'city' => 'Cuenca',
-      'url' => 'ftp://mirror.cedia.org.ec/mageia',
-    ),
-    3 => 
-    array (
-      'zone' => 'EC',
-      'country' => 'EC',
-      'city' => 'Cuenca',
-      'url' => 'http://mirror.cedia.org.ec/mageia',
-    ),
-    4 => 
-    array (
-      'zone' => 'EC',
-      'country' => 'EC',
-      'city' => 'Cuenca',
-      'url' => 'https://mirror.cedia.org.ec/mageia',
-    ),
   ),
 ); ?>