Update list of mirrors

3 files changed, 213 insertions, 325 deletions

diff --git a/lib/cached.list.php b/lib/cached.list.php
index ac691c3c8..dbac9c024 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -104,47 +104,40 @@
     ),
     12 => 
     array (
-      'zone' => 'TR',
-      'country' => 'TR',
-      'city' => 'Ankara',
-      'url' => 'http://ftp.linux.org.tr/mageia',
-    ),
-    13 => 
-    array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    14 => 
+    13 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    15 => 
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    16 => 
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    17 => 
+    16 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    18 => 
+    17 => 
     array (
       'zone' => 'VN',
       'country' => 'VN',
@@ -163,369 +156,341 @@
     ),
     1 => 
     array (
-      'zone' => 'BE',
-      'country' => 'BE',
-      'city' => 'Brussels',
-      'url' => 'http://ftp.belnet.be/mageia',
-    ),
-    2 => 
-    array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'ftp://mirrors.netix.net/mageia',
     ),
-    3 => 
+    2 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'http://mirrors.netix.net/mageia',
     ),
-    4 => 
+    3 => 
     array (
       'zone' => 'BY',
       'country' => 'BY',
       'city' => 'Minsk',
       'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
-    5 => 
+    4 => 
     array (
       'zone' => 'BY',
       'country' => 'BY',
       'city' => 'Minsk',
       'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
-    6 => 
+    5 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => '-',
       'url' => 'http://mageia.supp.name',
     ),
-    7 => 
+    6 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    8 => 
+    7 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    9 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => '-',
-      'url' => 'ftp://srv3.tuxinator.org/mageia',
-    ),
-    10 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => '-',
-      'url' => 'ftp://srv4.tuxinator.org/mageia',
-    ),
-    11 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => '-',
-      'url' => 'http://srv3.tuxinator.org/mageia',
-    ),
-    12 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => '-',
-      'url' => 'http://srv4.tuxinator.org/mageia',
-    ),
-    13 => 
+    8 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Cologne',
       'url' => 'ftp://mirror.netcologne.de/mageia',
     ),
-    14 => 
+    9 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Cologne',
       'url' => 'http://mirror.netcologne.de/mageia',
     ),
-    15 => 
+    10 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
-      'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
+      'url' => 'ftp://ftp.fau.de/mageia',
     ),
-    16 => 
+    11 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
-      'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
+      'url' => 'http://ftp.fau.de/mageia',
     ),
-    17 => 
+    12 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
-      'url' => 'https://ftp.uni-erlangen.de/mageia',
+      'url' => 'https://ftp.fau.de/mageia',
     ),
-    18 => 
+    13 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Esslingen',
       'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    19 => 
+    14 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Esslingen',
       'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    20 => 
+    15 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    21 => 
+    16 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    22 => 
+    17 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Hermsdorf',
-      'url' => 'ftp://mirror.tuxinator.org/mageia',
+      'url' => 'http://mirror.tuxinator.org/mageia',
     ),
-    23 => 
+    18 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'freiburg',
       'url' => 'ftp://mirror2.tuxinator.org/mageia',
     ),
-    24 => 
+    19 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'freiburg',
       'url' => 'http://mirror2.tuxinator.org/mageia',
     ),
-    25 => 
+    20 => 
     array (
       'zone' => 'DK',
       'country' => 'DK',
       'city' => 'DTU',
       'url' => 'ftp://ftp.klid.dk/mageia',
     ),
-    26 => 
+    21 => 
     array (
       'zone' => 'DK',
       'country' => 'DK',
       'city' => 'DTU',
       'url' => 'http://ftp.klid.dk/ftp/mageia',
     ),
-    27 => 
+    22 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
     ),
-    28 => 
+    23 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    29 => 
+    24 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    30 => 
+    25 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
     ),
-    31 => 
+    26 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    32 => 
+    27 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    33 => 
+    28 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://ftp.free.fr/mirrors/mageia.org',
     ),
-    34 => 
+    29 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Rennes',
       'url' => 'http://magie.remi.lu',
     ),
-    35 => 
+    30 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    36 => 
+    31 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    37 => 
+    32 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    38 => 
+    33 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    39 => 
+    34 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    40 => 
+    35 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    41 => 
+    36 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    42 => 
+    37 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    43 => 
+    38 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    44 => 
+    39 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    45 => 
+    40 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    46 => 
+    41 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    47 => 
+    42 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
-      'city' => 'Warszawa',
-      'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
+      'city' => 'Krakow',
+      'url' => 'ftp://mirror.onet.pl/pub/mirrors/mageia',
     ),
-    48 => 
+    43 => 
+    array (
+      'zone' => 'PL',
+      'country' => 'PL',
+      'city' => 'Krakow',
+      'url' => 'http://mirror.onet.pl/pub/mirrors/mageia',
+    ),
+    44 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    49 => 
+    45 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    50 => 
+    46 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    51 => 
+    47 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    52 => 
+    48 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    53 => 
+    49 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -546,35 +511,35 @@
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Lenoir',
-      'url' => 'http://mirror.dacentec.com/mageia',
+      'city' => 'Durham',
+      'url' => 'http://distro.ibiblio.org/pub/linux/distributions/mageia',
     ),
     2 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Princeton',
-      'url' => 'http://mirror.math.princeton.edu/pub/mageia',
+      'city' => 'Lenoir',
+      'url' => 'http://mirror.dacentec.com/mageia',
     ),
     3 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Southfeild',
-      'url' => 'http://mirror.nexcess.net/mageia',
+      'city' => 'Princeton',
+      'url' => 'http://mirror.math.princeton.edu/pub/mageia',
     ),
     4 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'glen allen',
+      'city' => 'RICHMOND',
       'url' => 'ftp://mageia.jameswhitby.net/mageia',
     ),
     5 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'glen allen',
+      'city' => 'RICHMOND',
       'url' => 'http://mageia.jameswhitby.net/mageia',
     ),
   ),
diff --git a/lib/cached.list_doc.php b/lib/cached.list_doc.php
index d500008d8..94d7ec873 100644
--- a/lib/cached.list_doc.php
+++ b/lib/cached.list_doc.php
@@ -97,54 +97,47 @@
     ),
     11 => 
     array (
-      'zone' => 'TR',
-      'country' => 'TR',
-      'city' => 'Ankara',
-      'url' => 'http://ftp.linux.org.tr/mageia',
-    ),
-    12 => 
-    array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    13 => 
+    12 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'http://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    14 => 
+    13 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    15 => 
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    16 => 
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    17 => 
+    16 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    18 => 
+    17 => 
     array (
       'zone' => 'VN',
       'country' => 'VN',
@@ -163,362 +156,341 @@
     ),
     1 => 
     array (
-      'zone' => 'BE',
-      'country' => 'BE',
-      'city' => 'Brussels',
-      'url' => 'http://ftp.belnet.be/mageia',
-    ),
-    2 => 
-    array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'ftp://mirrors.netix.net/mageia',
     ),
-    3 => 
+    2 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'http://mirrors.netix.net/mageia',
     ),
-    4 => 
+    3 => 
     array (
       'zone' => 'BY',
       'country' => 'BY',
       'city' => 'Minsk',
       'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
-    5 => 
+    4 => 
     array (
       'zone' => 'BY',
       'country' => 'BY',
       'city' => 'Minsk',
       'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
-    6 => 
+    5 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => '-',
       'url' => 'http://mageia.supp.name',
     ),
-    7 => 
+    6 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    8 => 
+    7 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    9 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => '-',
-      'url' => 'ftp://srv3.tuxinator.org/mageia',
-    ),
-    10 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => '-',
-      'url' => 'ftp://srv4.tuxinator.org/mageia',
-    ),
-    11 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => '-',
-      'url' => 'http://srv3.tuxinator.org/mageia',
-    ),
-    12 => 
+    8 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Cologne',
       'url' => 'ftp://mirror.netcologne.de/mageia',
     ),
-    13 => 
+    9 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Cologne',
       'url' => 'http://mirror.netcologne.de/mageia',
     ),
-    14 => 
+    10 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
-      'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
+      'url' => 'ftp://ftp.fau.de/mageia',
     ),
-    15 => 
+    11 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
-      'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
+      'url' => 'http://ftp.fau.de/mageia',
     ),
-    16 => 
+    12 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
-      'url' => 'https://ftp.uni-erlangen.de/mageia',
+      'url' => 'https://ftp.fau.de/mageia',
     ),
-    17 => 
+    13 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Esslingen',
       'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    18 => 
+    14 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Esslingen',
       'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    19 => 
+    15 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    20 => 
+    16 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    21 => 
+    17 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Hermsdorf',
-      'url' => 'ftp://mirror.tuxinator.org/mageia',
+      'url' => 'http://mirror.tuxinator.org/mageia',
     ),
-    22 => 
+    18 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'freiburg',
       'url' => 'ftp://mirror2.tuxinator.org/mageia',
     ),
-    23 => 
+    19 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'freiburg',
       'url' => 'http://mirror2.tuxinator.org/mageia',
     ),
-    24 => 
+    20 => 
     array (
       'zone' => 'DK',
       'country' => 'DK',
       'city' => 'DTU',
       'url' => 'ftp://ftp.klid.dk/mageia',
     ),
-    25 => 
+    21 => 
     array (
       'zone' => 'DK',
       'country' => 'DK',
       'city' => 'DTU',
       'url' => 'http://ftp.klid.dk/ftp/mageia',
     ),
-    26 => 
+    22 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'ftp://fr2.rpmfind.net/linux/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' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    29 => 
+    25 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
     ),
-    30 => 
+    26 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    31 => 
+    27 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    32 => 
+    28 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://ftp.free.fr/mirrors/mageia.org',
     ),
-    33 => 
+    29 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Rennes',
       'url' => 'http://magie.remi.lu',
     ),
-    34 => 
+    30 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    35 => 
+    31 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    36 => 
+    32 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    37 => 
+    33 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    38 => 
+    34 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    39 => 
+    35 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    40 => 
+    36 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    41 => 
+    37 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    42 => 
+    38 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    43 => 
+    39 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    44 => 
+    40 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    45 => 
+    41 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    46 => 
+    42 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
-      'city' => 'Warszawa',
-      'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
+      'city' => 'Krakow',
+      'url' => 'ftp://mirror.onet.pl/pub/mirrors/mageia',
     ),
-    47 => 
+    43 => 
+    array (
+      'zone' => 'PL',
+      'country' => 'PL',
+      'city' => 'Krakow',
+      'url' => 'http://mirror.onet.pl/pub/mirrors/mageia',
+    ),
+    44 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    48 => 
+    45 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    49 => 
+    46 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    50 => 
+    47 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    51 => 
+    48 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    52 => 
+    49 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -553,21 +525,14 @@
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Southfeild',
-      'url' => 'http://mirror.nexcess.net/mageia',
-    ),
-    4 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'glen allen',
+      'city' => 'RICHMOND',
       'url' => 'ftp://mageia.jameswhitby.net/mageia',
     ),
-    5 => 
+    4 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'glen allen',
+      'city' => 'RICHMOND',
       'url' => 'http://mageia.jameswhitby.net/mageia',
     ),
   ),
diff --git a/lib/cached.list_mirrorlist.php b/lib/cached.list_mirrorlist.php
index 19580373a..ce8cdd69a 100644
--- a/lib/cached.list_mirrorlist.php
+++ b/lib/cached.list_mirrorlist.php
@@ -104,54 +104,47 @@
     ),
     12 => 
     array (
-      'zone' => 'TR',
-      'country' => 'TR',
-      'city' => 'Ankara',
-      'url' => 'http://ftp.linux.org.tr/mageia',
-    ),
-    13 => 
-    array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    14 => 
+    13 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'http://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    15 => 
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    16 => 
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    17 => 
+    16 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    18 => 
+    17 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    19 => 
+    18 => 
     array (
       'zone' => 'VN',
       'country' => 'VN',
@@ -170,376 +163,348 @@
     ),
     1 => 
     array (
-      'zone' => 'BE',
-      'country' => 'BE',
-      'city' => 'Brussels',
-      'url' => 'http://ftp.belnet.be/mageia',
-    ),
-    2 => 
-    array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'ftp://mirrors.netix.net/mageia',
     ),
-    3 => 
+    2 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'http://mirrors.netix.net/mageia',
     ),
-    4 => 
+    3 => 
     array (
       'zone' => 'BY',
       'country' => 'BY',
       'city' => 'Minsk',
       'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
-    5 => 
+    4 => 
     array (
       'zone' => 'BY',
       'country' => 'BY',
       'city' => 'Minsk',
       'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
-    6 => 
+    5 => 
     array (
       'zone' => 'CH',
       'country' => 'CH',
       'city' => 'geneva',
       'url' => 'http://mageia.unige.ch/mirror',
     ),
-    7 => 
+    6 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => '-',
       'url' => 'http://mageia.supp.name',
     ),
-    8 => 
+    7 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    9 => 
+    8 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    10 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => '-',
-      'url' => 'ftp://srv3.tuxinator.org/mageia',
-    ),
-    11 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => '-',
-      'url' => 'ftp://srv4.tuxinator.org/mageia',
-    ),
-    12 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => '-',
-      'url' => 'http://srv3.tuxinator.org/mageia',
-    ),
-    13 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => '-',
-      'url' => 'http://srv4.tuxinator.org/mageia',
-    ),
-    14 => 
+    9 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Cologne',
       'url' => 'ftp://mirror.netcologne.de/mageia',
     ),
-    15 => 
+    10 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Cologne',
       'url' => 'http://mirror.netcologne.de/mageia',
     ),
-    16 => 
+    11 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
-      'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
+      'url' => 'ftp://ftp.fau.de/mageia',
     ),
-    17 => 
+    12 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
-      'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
+      'url' => 'http://ftp.fau.de/mageia',
     ),
-    18 => 
+    13 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
-      'url' => 'https://ftp.uni-erlangen.de/mageia',
+      'url' => 'https://ftp.fau.de/mageia',
     ),
-    19 => 
+    14 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Esslingen',
       'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    20 => 
+    15 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Esslingen',
       'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    21 => 
+    16 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    22 => 
+    17 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    23 => 
+    18 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Hermsdorf',
-      'url' => 'ftp://mirror.tuxinator.org/mageia',
+      'url' => 'http://mirror.tuxinator.org/mageia',
     ),
-    24 => 
+    19 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'freiburg',
       'url' => 'ftp://mirror2.tuxinator.org/mageia',
     ),
-    25 => 
+    20 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'freiburg',
       'url' => 'http://mirror2.tuxinator.org/mageia',
     ),
-    26 => 
+    21 => 
     array (
       'zone' => 'DK',
       'country' => 'DK',
       'city' => 'DTU',
       'url' => 'ftp://ftp.klid.dk/mageia',
     ),
-    27 => 
+    22 => 
     array (
       'zone' => 'DK',
       'country' => 'DK',
       'city' => 'DTU',
       'url' => 'http://ftp.klid.dk/ftp/mageia',
     ),
-    28 => 
+    23 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
     ),
-    29 => 
+    24 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    30 => 
+    25 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    31 => 
+    26 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
     ),
-    32 => 
+    27 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    33 => 
+    28 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    34 => 
+    29 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://ftp.free.fr/mirrors/mageia.org',
     ),
-    35 => 
+    30 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Rennes',
       'url' => 'http://magie.remi.lu',
     ),
-    36 => 
+    31 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    37 => 
+    32 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    38 => 
+    33 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    39 => 
+    34 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    40 => 
+    35 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    41 => 
+    36 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    42 => 
+    37 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    43 => 
+    38 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    44 => 
+    39 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    45 => 
+    40 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    46 => 
+    41 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    47 => 
+    42 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    48 => 
+    43 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
-      'city' => 'Warszawa',
-      'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
+      'city' => 'Krakow',
+      'url' => 'ftp://mirror.onet.pl/pub/mirrors/mageia',
     ),
-    49 => 
+    44 => 
+    array (
+      'zone' => 'PL',
+      'country' => 'PL',
+      'city' => 'Krakow',
+      'url' => 'http://mirror.onet.pl/pub/mirrors/mageia',
+    ),
+    45 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    50 => 
+    46 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    51 => 
+    47 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    52 => 
+    48 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    53 => 
+    49 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    54 => 
+    50 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -581,24 +546,17 @@
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Southfeild',
-      'url' => 'http://mirror.nexcess.net/mageia',
-    ),
-    5 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'glen allen',
+      'city' => 'RICHMOND',
       'url' => 'ftp://mageia.jameswhitby.net/mageia',
     ),
-    6 => 
+    5 => 
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'glen allen',
+      'city' => 'RICHMOND',
       'url' => 'http://mageia.jameswhitby.net/mageia',
     ),
-    7 => 
+    6 => 
     array (
       'zone' => 'US',
       'country' => 'US',