refresh mirror cache list with proper chr encoding

3 files changed, 239 insertions, 155 deletions

diff --git a/lib/cached.list.php b/lib/cached.list.php
index 71f34be15..ac691c3c8 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -36,101 +36,115 @@
     array (
       'zone' => 'CN',
       'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'ftp://mirrors.ustc.edu.cn/mageia',
+    ),
+    3 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'http://mirrors.ustc.edu.cn/mageia',
+    ),
+    4 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'https://mirrors.ustc.edu.cn/mageia',
+    ),
+    5 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'http://ftp.sjtu.edu.cn/mageia',
     ),
-    3 => 
+    6 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'https://ftp.sjtu.edu.cn/mageia',
     ),
-    4 => 
+    7 => 
     array (
       'zone' => 'IL',
       'country' => 'IL',
-      'city' => '?',
+      'city' => '-',
       'url' => 'http://mirror.isoc.org.il/pub/mageia',
     ),
-    5 => 
+    8 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    6 => 
+    9 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'ftp://mirror.rise.ph/mageia',
     ),
-    7 => 
+    10 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'http://mirror.rise.ph/mageia',
     ),
-    8 => 
+    11 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    9 => 
+    12 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    10 => 
+    13 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    11 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'ftp://free.nchc.org.tw/mageia',
-    ),
-    12 => 
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    13 => 
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    14 => 
+    16 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    15 => 
+    17 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    16 => 
+    18 => 
     array (
       'zone' => 'VN',
       'country' => 'VN',
@@ -186,7 +200,7 @@
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
-      'city' => '?',
+      'city' => '-',
       'url' => 'http://mageia.supp.name',
     ),
     7 => 
@@ -207,28 +221,28 @@
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => '?',
+      'city' => '-',
       'url' => 'ftp://srv3.tuxinator.org/mageia',
     ),
     10 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => '?',
+      'city' => '-',
       'url' => 'ftp://srv4.tuxinator.org/mageia',
     ),
     11 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => '?',
+      'city' => '-',
       'url' => 'http://srv3.tuxinator.org/mageia',
     ),
     12 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => '?',
+      'city' => '-',
       'url' => 'http://srv4.tuxinator.org/mageia',
     ),
     13 => 
@@ -284,14 +298,14 @@
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Göttingen',
+      'city' => 'Göttingen',
       'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
     21 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Göttingen',
+      'city' => 'Göttingen',
       'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
     ),
     22 => 
@@ -380,131 +394,138 @@
     ),
     34 => 
     array (
+      'zone' => 'FR',
+      'country' => 'FR',
+      'city' => 'Rennes',
+      'url' => 'http://magie.remi.lu',
+    ),
+    35 => 
+    array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    35 => 
+    36 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    36 => 
+    37 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    37 => 
+    38 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    38 => 
+    39 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    39 => 
+    40 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    40 => 
+    41 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    41 => 
+    42 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    42 => 
+    43 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    43 => 
+    44 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    44 => 
+    45 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    45 => 
+    46 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    46 => 
+    47 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    47 => 
+    48 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    48 => 
+    49 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    49 => 
+    50 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    50 => 
+    51 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
-      'city' => 'Umeå',
+      'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    51 => 
+    52 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    52 => 
+    53 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -518,7 +539,7 @@
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => '?',
+      'city' => '-',
       'url' => 'http://mirrors.kernel.org/mageia',
     ),
     1 => 
@@ -573,14 +594,14 @@
     array (
       'zone' => 'BR',
       'country' => 'BR',
-      'city' => '?',
+      'city' => '-',
       'url' => 'ftp://mageia.c3sl.ufpr.br/mageia',
     ),
     1 => 
     array (
       'zone' => 'BR',
       'country' => 'BR',
-      'city' => '?',
+      'city' => '-',
       'url' => 'http://mageia.c3sl.ufpr.br',
     ),
     2 => 
@@ -588,16 +609,23 @@
       'zone' => 'BR',
       'country' => 'BR',
       'city' => 'Brasilia',
-      'url' => 'http://mageia.fis.unb.br',
+      'url' => 'ftp://mageia.fis.unb.br/linux/mageia',
     ),
     3 => 
     array (
+      'zone' => 'BR',
+      'country' => 'BR',
+      'city' => 'Brasilia',
+      'url' => 'http://mageia.fis.unb.br',
+    ),
+    4 => 
+    array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'ftp://mirror.cedia.org.ec/mageia',
     ),
-    4 => 
+    5 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
diff --git a/lib/cached.list_doc.php b/lib/cached.list_doc.php
index baf49b8d5..d500008d8 100644
--- a/lib/cached.list_doc.php
+++ b/lib/cached.list_doc.php
@@ -44,78 +44,78 @@
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Hefei',
-      'url' => 'https://mirrors.ustc.edu.cn/mageia',
+      'url' => 'http://mirrors.ustc.edu.cn/mageia',
     ),
     4 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'https://mirrors.ustc.edu.cn/mageia',
+    ),
+    5 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'http://ftp.sjtu.edu.cn/mageia',
     ),
-    5 => 
+    6 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'https://ftp.sjtu.edu.cn/mageia',
     ),
-    6 => 
+    7 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    7 => 
+    8 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'ftp://mirror.rise.ph/mageia',
     ),
-    8 => 
+    9 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'http://mirror.rise.ph/mageia',
     ),
-    9 => 
+    10 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    10 => 
+    11 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    11 => 
+    12 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    12 => 
+    13 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'http://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    13 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'ftp://free.nchc.org.tw/mageia',
-    ),
     14 => 
     array (
       'zone' => 'TW',
@@ -200,7 +200,7 @@
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
-      'city' => '?',
+      'city' => '-',
       'url' => 'http://mageia.supp.name',
     ),
     7 => 
@@ -221,21 +221,21 @@
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => '?',
+      'city' => '-',
       'url' => 'ftp://srv3.tuxinator.org/mageia',
     ),
     10 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => '?',
+      'city' => '-',
       'url' => 'ftp://srv4.tuxinator.org/mageia',
     ),
     11 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => '?',
+      'city' => '-',
       'url' => 'http://srv3.tuxinator.org/mageia',
     ),
     12 => 
@@ -291,14 +291,14 @@
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Göttingen',
+      'city' => 'Göttingen',
       'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
     20 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Göttingen',
+      'city' => 'Göttingen',
       'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
     ),
     21 => 
@@ -387,131 +387,138 @@
     ),
     33 => 
     array (
+      'zone' => 'FR',
+      'country' => 'FR',
+      'city' => 'Rennes',
+      'url' => 'http://magie.remi.lu',
+    ),
+    34 => 
+    array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    34 => 
+    35 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    35 => 
+    36 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    36 => 
+    37 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    37 => 
+    38 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    38 => 
+    39 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    39 => 
+    40 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    40 => 
+    41 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    41 => 
+    42 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    42 => 
+    43 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    43 => 
+    44 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    44 => 
+    45 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    45 => 
+    46 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    46 => 
+    47 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    47 => 
+    48 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    48 => 
+    49 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    49 => 
+    50 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
-      'city' => 'Umeå',
+      'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    50 => 
+    51 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    51 => 
+    52 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -525,7 +532,7 @@
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => '?',
+      'city' => '-',
       'url' => 'http://mirrors.kernel.org/mageia',
     ),
     1 => 
@@ -587,14 +594,14 @@
     array (
       'zone' => 'BR',
       'country' => 'BR',
-      'city' => '?',
+      'city' => '-',
       'url' => 'ftp://mageia.c3sl.ufpr.br/mageia',
     ),
     1 => 
     array (
       'zone' => 'BR',
       'country' => 'BR',
-      'city' => '?',
+      'city' => '-',
       'url' => 'http://mageia.c3sl.ufpr.br',
     ),
     2 => 
@@ -602,16 +609,23 @@
       'zone' => 'BR',
       'country' => 'BR',
       'city' => 'Brasilia',
-      'url' => 'http://mageia.fis.unb.br',
+      'url' => 'ftp://mageia.fis.unb.br/linux/mageia',
     ),
     3 => 
     array (
+      'zone' => 'BR',
+      'country' => 'BR',
+      'city' => 'Brasilia',
+      'url' => 'http://mageia.fis.unb.br',
+    ),
+    4 => 
+    array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'ftp://mirror.cedia.org.ec/mageia',
     ),
-    4 => 
+    5 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
diff --git a/lib/cached.list_mirrorlist.php b/lib/cached.list_mirrorlist.php
index 12b0a236c..19580373a 100644
--- a/lib/cached.list_mirrorlist.php
+++ b/lib/cached.list_mirrorlist.php
@@ -36,108 +36,122 @@
     array (
       'zone' => 'CN',
       'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'ftp://mirrors.ustc.edu.cn/mageia',
+    ),
+    3 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'http://mirrors.ustc.edu.cn/mageia',
+    ),
+    4 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'https://mirrors.ustc.edu.cn/mageia',
+    ),
+    5 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'http://ftp.sjtu.edu.cn/mageia',
     ),
-    3 => 
+    6 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
       'url' => 'https://ftp.sjtu.edu.cn/mageia',
     ),
-    4 => 
+    7 => 
     array (
       'zone' => 'IL',
       'country' => 'IL',
-      'city' => '?',
+      'city' => '-',
       'url' => 'http://mirror.isoc.org.il/pub/mageia',
     ),
-    5 => 
+    8 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    6 => 
+    9 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'ftp://mirror.rise.ph/mageia',
     ),
-    7 => 
+    10 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'http://mirror.rise.ph/mageia',
     ),
-    8 => 
+    11 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    9 => 
+    12 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    10 => 
+    13 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    11 => 
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Chungli',
       'url' => 'http://ftp.yzu.edu.tw/Linux/Mageia',
     ),
-    12 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'ftp://free.nchc.org.tw/mageia',
-    ),
-    13 => 
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    14 => 
+    16 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    15 => 
+    17 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    16 => 
+    18 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    17 => 
+    19 => 
     array (
       'zone' => 'VN',
       'country' => 'VN',
@@ -200,7 +214,7 @@
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
-      'city' => '?',
+      'city' => '-',
       'url' => 'http://mageia.supp.name',
     ),
     8 => 
@@ -221,28 +235,28 @@
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => '?',
+      'city' => '-',
       'url' => 'ftp://srv3.tuxinator.org/mageia',
     ),
     11 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => '?',
+      'city' => '-',
       'url' => 'ftp://srv4.tuxinator.org/mageia',
     ),
     12 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => '?',
+      'city' => '-',
       'url' => 'http://srv3.tuxinator.org/mageia',
     ),
     13 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => '?',
+      'city' => '-',
       'url' => 'http://srv4.tuxinator.org/mageia',
     ),
     14 => 
@@ -298,14 +312,14 @@
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Göttingen',
+      'city' => 'Göttingen',
       'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
     22 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Göttingen',
+      'city' => 'Göttingen',
       'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
     ),
     23 => 
@@ -394,131 +408,138 @@
     ),
     35 => 
     array (
+      'zone' => 'FR',
+      'country' => 'FR',
+      'city' => 'Rennes',
+      'url' => 'http://magie.remi.lu',
+    ),
+    36 => 
+    array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    36 => 
+    37 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    37 => 
+    38 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    38 => 
+    39 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => 'Heraklion',
       'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
-    39 => 
+    40 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    40 => 
+    41 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    41 => 
+    42 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Roma',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    42 => 
+    43 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    43 => 
+    44 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    44 => 
+    45 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://mageia.mirror.triple-it.nl',
     ),
-    45 => 
+    46 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    46 => 
+    47 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    47 => 
+    48 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    48 => 
+    49 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    49 => 
+    50 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    50 => 
+    51 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Moscow',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    51 => 
+    52 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
-      'city' => 'Umeå',
+      'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    52 => 
+    53 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    53 => 
+    54 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -532,44 +553,58 @@
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => '?',
+      'city' => '-',
       'url' => 'http://mirrors.kernel.org/mageia',
     ),
     1 => 
     array (
       'zone' => 'US',
       'country' => 'US',
+      'city' => 'Durham',
+      'url' => 'http://distro.ibiblio.org/pub/linux/distributions/mageia',
+    ),
+    2 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
       'city' => 'Lenoir',
       'url' => 'http://mirror.dacentec.com/mageia',
     ),
-    2 => 
+    3 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Princeton',
       'url' => 'http://mirror.math.princeton.edu/pub/mageia',
     ),
-    3 => 
+    4 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Southfeild',
       'url' => 'http://mirror.nexcess.net/mageia',
     ),
-    4 => 
+    5 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'glen allen',
       'url' => 'ftp://mageia.jameswhitby.net/mageia',
     ),
-    5 => 
+    6 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'glen allen',
       'url' => 'http://mageia.jameswhitby.net/mageia',
     ),
+    7 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'lansing',
+      'url' => 'http://mirrors-usa.go-parts.com/mageia',
+    ),
   ),
   '_C:OC' => 
   array (
@@ -594,14 +629,14 @@
     array (
       'zone' => 'BR',
       'country' => 'BR',
-      'city' => '?',
+      'city' => '-',
       'url' => 'ftp://mageia.c3sl.ufpr.br/mageia',
     ),
     1 => 
     array (
       'zone' => 'BR',
       'country' => 'BR',
-      'city' => '?',
+      'city' => '-',
       'url' => 'http://mageia.c3sl.ufpr.br',
     ),
     2 => 
@@ -609,16 +644,23 @@
       'zone' => 'BR',
       'country' => 'BR',
       'city' => 'Brasilia',
-      'url' => 'http://mageia.fis.unb.br',
+      'url' => 'ftp://mageia.fis.unb.br/linux/mageia',
     ),
     3 => 
     array (
+      'zone' => 'BR',
+      'country' => 'BR',
+      'city' => 'Brasilia',
+      'url' => 'http://mageia.fis.unb.br',
+    ),
+    4 => 
+    array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'ftp://mirror.cedia.org.ec/mageia',
     ),
-    4 => 
+    5 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',