refresh cached list

3 files changed, 186 insertions, 270 deletions

diff --git a/lib/cached.list.php b/lib/cached.list.php
index 145ecd6f3..cb45d304f 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -22,29 +22,29 @@
     array (
       'zone' => 'CN',
       'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'http://mirrors.ustc.edu.cn/mageia',
+      'city' => 'Beijing',
+      'url' => 'http://mirrors.tuna.tsinghua.edu.cn/mageia',
     ),
     1 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'https://mirrors.ustc.edu.cn/mageia',
+      'city' => 'Beijing',
+      'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
     ),
     2 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
-      'city' => 'Shanghai',
-      'url' => 'http://ftp.sjtu.edu.cn/mageia',
+      'city' => 'Hefei',
+      'url' => 'http://mirrors.ustc.edu.cn/mageia',
     ),
     3 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
-      'city' => 'Shanghai',
-      'url' => 'https://ftp.sjtu.edu.cn/mageia',
+      'city' => 'Hefei',
+      'url' => 'https://mirrors.ustc.edu.cn/mageia',
     ),
     4 => 
     array (
@@ -106,24 +106,10 @@
     array (
       'zone' => 'TW',
       'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'ftp://free.nchc.org.tw/mageia',
-    ),
-    13 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'http://free.nchc.org.tw/mageia',
-    ),
-    14 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    15 => 
+    13 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -142,320 +128,306 @@
     ),
     1 => 
     array (
-      'zone' => 'BG',
-      'country' => 'BG',
-      'city' => 'Sofia',
-      'url' => 'ftp://mirrors.netix.net/mageia',
-    ),
-    2 => 
-    array (
-      'zone' => 'BG',
-      'country' => 'BG',
-      'city' => 'Sofia',
-      'url' => 'http://mirrors.netix.net/mageia',
-    ),
-    3 => 
-    array (
       'zone' => 'BY',
       'country' => 'BY',
       'city' => 'Minsk',
       'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
-    4 => 
+    2 => 
     array (
       'zone' => 'BY',
       'country' => 'BY',
       'city' => 'Minsk',
       'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
-    5 => 
+    3 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => '-',
       'url' => 'http://mageia.supp.name',
     ),
-    6 => 
+    4 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    7 => 
+    5 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    8 => 
+    6 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Düsseldorf',
       'url' => 'http://mirror.tuxinator.org/mageia',
     ),
-    9 => 
+    7 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'ftp://ftp.fau.de/mageia',
     ),
-    10 => 
+    8 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'http://ftp.fau.de/mageia',
     ),
-    11 => 
+    9 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'https://ftp.fau.de/mageia',
     ),
-    12 => 
+    10 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Esslingen',
-      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
+      'city' => 'Falkenstein/Vogtl.',
+      'url' => 'ftp://mirror2.tuxinator.org/mageia',
     ),
-    13 => 
+    11 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Esslingen',
-      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
+      'city' => 'Falkenstein/Vogtl.',
+      'url' => 'http://mirror2.tuxinator.org/mageia',
     ),
-    14 => 
+    12 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Esslingen',
-      'url' => 'https://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
+      'city' => 'Göttingen',
+      'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    15 => 
+    13 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Falkenstein/Vogtl.',
-      'url' => 'ftp://mirror2.tuxinator.org/mageia',
+      'city' => 'Göttingen',
+      'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    16 => 
+    14 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Falkenstein/Vogtl.',
-      'url' => 'http://mirror2.tuxinator.org/mageia',
+      'city' => 'Göttingen',
+      'url' => 'https://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    17 => 
+    15 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Göttingen',
-      'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
+      'city' => 'Schneverdingen',
+      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    18 => 
+    16 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Göttingen',
-      'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
+      'city' => 'Schneverdingen',
+      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    19 => 
+    17 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Göttingen',
-      'url' => 'https://ftp5.gwdg.de/pub/linux/mageia',
+      'city' => 'Schneverdingen',
+      'url' => 'https://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    20 => 
+    18 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
     ),
-    21 => 
+    19 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    22 => 
+    20 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    23 => 
+    21 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
     ),
-    24 => 
+    22 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    25 => 
+    23 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    26 => 
+    24 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://ftp.free.fr/mirrors/mageia.org',
     ),
-    27 => 
+    25 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://magie.remi.lu',
     ),
-    28 => 
+    26 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    29 => 
+    27 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    30 => 
+    28 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    31 => 
+    29 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    32 => 
+    30 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    33 => 
+    31 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    34 => 
+    32 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    35 => 
+    33 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    36 => 
+    34 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    37 => 
+    35 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    38 => 
+    36 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    39 => 
+    37 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    40 => 
+    38 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    41 => 
+    39 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    42 => 
+    40 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    43 => 
+    41 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    44 => 
+    42 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    45 => 
+    43 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    46 => 
+    44 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -546,13 +518,6 @@
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
-      'url' => 'ftp://mirror.cedia.org.ec/mageia',
-    ),
-    4 => 
-    array (
-      'zone' => 'EC',
-      'country' => 'EC',
-      'city' => 'Cuenca',
       'url' => 'http://mirror.cedia.org.ec/mageia',
     ),
   ),
diff --git a/lib/cached.list_doc.php b/lib/cached.list_doc.php
index 63ca9cf15..b1fd9f274 100644
--- a/lib/cached.list_doc.php
+++ b/lib/cached.list_doc.php
@@ -149,320 +149,306 @@
     ),
     1 => 
     array (
-      'zone' => 'BG',
-      'country' => 'BG',
-      'city' => 'Sofia',
-      'url' => 'ftp://mirrors.netix.net/mageia',
-    ),
-    2 => 
-    array (
-      'zone' => 'BG',
-      'country' => 'BG',
-      'city' => 'Sofia',
-      'url' => 'http://mirrors.netix.net/mageia',
-    ),
-    3 => 
-    array (
       'zone' => 'BY',
       'country' => 'BY',
       'city' => 'Minsk',
       'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
-    4 => 
+    2 => 
     array (
       'zone' => 'BY',
       'country' => 'BY',
       'city' => 'Minsk',
       'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
-    5 => 
+    3 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => '-',
       'url' => 'http://mageia.supp.name',
     ),
-    6 => 
+    4 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    7 => 
+    5 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    8 => 
+    6 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Düsseldorf',
       'url' => 'http://mirror.tuxinator.org/mageia',
     ),
-    9 => 
+    7 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'ftp://ftp.fau.de/mageia',
     ),
-    10 => 
+    8 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'http://ftp.fau.de/mageia',
     ),
-    11 => 
+    9 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'https://ftp.fau.de/mageia',
     ),
-    12 => 
+    10 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Esslingen',
-      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
+      'city' => 'Falkenstein/Vogtl.',
+      'url' => 'ftp://mirror2.tuxinator.org/mageia',
     ),
-    13 => 
+    11 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Esslingen',
-      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
+      'city' => 'Falkenstein/Vogtl.',
+      'url' => 'http://mirror2.tuxinator.org/mageia',
     ),
-    14 => 
+    12 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Esslingen',
-      'url' => 'https://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
+      'city' => 'Göttingen',
+      'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    15 => 
+    13 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Falkenstein/Vogtl.',
-      'url' => 'ftp://mirror2.tuxinator.org/mageia',
+      'city' => 'Göttingen',
+      'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    16 => 
+    14 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Falkenstein/Vogtl.',
-      'url' => 'http://mirror2.tuxinator.org/mageia',
+      'city' => 'Göttingen',
+      'url' => 'https://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    17 => 
+    15 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Göttingen',
-      'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
+      'city' => 'Schneverdingen',
+      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    18 => 
+    16 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Göttingen',
-      'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
+      'city' => 'Schneverdingen',
+      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    19 => 
+    17 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Göttingen',
-      'url' => 'https://ftp5.gwdg.de/pub/linux/mageia',
+      'city' => 'Schneverdingen',
+      'url' => 'https://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    20 => 
+    18 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
     ),
-    21 => 
+    19 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    22 => 
+    20 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    23 => 
+    21 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
     ),
-    24 => 
+    22 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    25 => 
+    23 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    26 => 
+    24 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://ftp.free.fr/mirrors/mageia.org',
     ),
-    27 => 
+    25 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://magie.remi.lu',
     ),
-    28 => 
+    26 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    29 => 
+    27 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    30 => 
+    28 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    31 => 
+    29 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    32 => 
+    30 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    33 => 
+    31 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    34 => 
+    32 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    35 => 
+    33 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    36 => 
+    34 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    37 => 
+    35 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    38 => 
+    36 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    39 => 
+    37 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    40 => 
+    38 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    41 => 
+    39 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    42 => 
+    40 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    43 => 
+    41 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    44 => 
+    42 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    45 => 
+    43 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    46 => 
+    44 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -553,13 +539,6 @@
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
-      'url' => 'ftp://mirror.cedia.org.ec/mageia',
-    ),
-    4 => 
-    array (
-      'zone' => 'EC',
-      'country' => 'EC',
-      'city' => 'Cuenca',
       'url' => 'http://mirror.cedia.org.ec/mageia',
     ),
   ),
diff --git a/lib/cached.list_mirrorlist.php b/lib/cached.list_mirrorlist.php
index 8ff993975..44c2d7a20 100644
--- a/lib/cached.list_mirrorlist.php
+++ b/lib/cached.list_mirrorlist.php
@@ -156,320 +156,306 @@
     ),
     1 => 
     array (
-      'zone' => 'BG',
-      'country' => 'BG',
-      'city' => 'Sofia',
-      'url' => 'ftp://mirrors.netix.net/mageia',
-    ),
-    2 => 
-    array (
-      'zone' => 'BG',
-      'country' => 'BG',
-      'city' => 'Sofia',
-      'url' => 'http://mirrors.netix.net/mageia',
-    ),
-    3 => 
-    array (
       'zone' => 'BY',
       'country' => 'BY',
       'city' => 'Minsk',
       'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
-    4 => 
+    2 => 
     array (
       'zone' => 'BY',
       'country' => 'BY',
       'city' => 'Minsk',
       'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
-    5 => 
+    3 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => '-',
       'url' => 'http://mageia.supp.name',
     ),
-    6 => 
+    4 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    7 => 
+    5 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    8 => 
+    6 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Düsseldorf',
       'url' => 'http://mirror.tuxinator.org/mageia',
     ),
-    9 => 
+    7 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'ftp://ftp.fau.de/mageia',
     ),
-    10 => 
+    8 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'http://ftp.fau.de/mageia',
     ),
-    11 => 
+    9 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
       'url' => 'https://ftp.fau.de/mageia',
     ),
-    12 => 
+    10 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Esslingen',
-      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
+      'city' => 'Falkenstein/Vogtl.',
+      'url' => 'ftp://mirror2.tuxinator.org/mageia',
     ),
-    13 => 
+    11 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Esslingen',
-      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
+      'city' => 'Falkenstein/Vogtl.',
+      'url' => 'http://mirror2.tuxinator.org/mageia',
     ),
-    14 => 
+    12 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Esslingen',
-      'url' => 'https://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
+      'city' => 'Göttingen',
+      'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    15 => 
+    13 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Falkenstein/Vogtl.',
-      'url' => 'ftp://mirror2.tuxinator.org/mageia',
+      'city' => 'Göttingen',
+      'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    16 => 
+    14 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Falkenstein/Vogtl.',
-      'url' => 'http://mirror2.tuxinator.org/mageia',
+      'city' => 'Göttingen',
+      'url' => 'https://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    17 => 
+    15 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Göttingen',
-      'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
+      'city' => 'Schneverdingen',
+      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    18 => 
+    16 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Göttingen',
-      'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
+      'city' => 'Schneverdingen',
+      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    19 => 
+    17 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Göttingen',
-      'url' => 'https://ftp5.gwdg.de/pub/linux/mageia',
+      'city' => 'Schneverdingen',
+      'url' => 'https://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    20 => 
+    18 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
     ),
-    21 => 
+    19 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    22 => 
+    20 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    23 => 
+    21 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
     ),
-    24 => 
+    22 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    25 => 
+    23 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    26 => 
+    24 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://ftp.free.fr/mirrors/mageia.org',
     ),
-    27 => 
+    25 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://magie.remi.lu',
     ),
-    28 => 
+    26 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    29 => 
+    27 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    30 => 
+    28 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    31 => 
+    29 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    32 => 
+    30 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    33 => 
+    31 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    34 => 
+    32 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    35 => 
+    33 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    36 => 
+    34 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    37 => 
+    35 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    38 => 
+    36 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    39 => 
+    37 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    40 => 
+    38 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    41 => 
+    39 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    42 => 
+    40 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    43 => 
+    41 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    44 => 
+    42 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    45 => 
+    43 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    46 => 
+    44 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -528,13 +514,6 @@
     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',
     ),
@@ -567,13 +546,6 @@
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
-      'url' => 'ftp://mirror.cedia.org.ec/mageia',
-    ),
-    4 => 
-    array (
-      'zone' => 'EC',
-      'country' => 'EC',
-      'city' => 'Cuenca',
       'url' => 'http://mirror.cedia.org.ec/mageia',
     ),
   ),