1 files changed, 64 insertions, 79 deletions
diff --git a/lib/cached.list.php b/lib/cached.list.php
index 945fc7128..7982c2609 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -1,59 +1,23 @@
 <?php $mirrors = array (
-  'FR' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Paris',
-      'zone' => 'FR',
-      'url' => 'https://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Paris',
-      'zone' => 'FR',
-      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
-    ),
-    2 => 
-    array (
-      'city' => 'Paris',
-      'zone' => 'FR',
-      'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
-    ),
-  ),
-  'CH' => 
-  array (
-    0 => 
-    array (
-      'city' => 'geneva',
-      'zone' => 'CH',
-      'url' => 'http://mageia.unige.ch/mirror',
-    ),
-    1 => 
-    array (
-      'city' => 'Lucern',
-      'zone' => 'CH',
-      'url' => 'ftp://ftp.LinuxCabal.org/pub/mirrors/Mageia',
-    ),
-  ),
   'DE' => 
   array (
     0 => 
     array (
-      'city' => 'Erlangen',
+      'city' => 'Erfurt',
       'zone' => 'DE',
-      'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
+      'url' => 'ftp://ftp.mandrivauser.de/mirrors/Mageia',
     ),
     1 => 
     array (
-      'city' => 'Esslingen',
+      'city' => 'Erfurt',
       'zone' => 'DE',
-      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
+      'url' => 'http://ftp.mandrivauser.de/mirrors/Mageia',
     ),
     2 => 
     array (
-      'city' => 'Erfurt',
+      'city' => 'Esslingen',
       'zone' => 'DE',
-      'url' => 'http://ftp.mandrivauser.de/mirrors/Mageia',
+      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
     3 => 
     array (
@@ -63,36 +27,15 @@
     ),
     4 => 
     array (
-      'city' => 'Erfurt',
-      'zone' => 'DE',
-      'url' => 'ftp://ftp.mandrivauser.de/mirrors/Mageia',
-    ),
-    5 => 
-    array (
       'city' => 'Esslingen',
       'zone' => 'DE',
       'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-  ),
-  'CZ' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Paris',
-      'zone' => 'CZ',
-      'url' => 'ftp://ftp.sh.cvut.cz/MIRRORS/mageia',
-    ),
-    1 => 
+    5 => 
     array (
       'city' => 'Erlangen',
-      'zone' => 'CZ',
-      'url' => 'http://ftp.sh.cvut.cz/MIRRORS/mageia',
-    ),
-    2 => 
-    array (
-      'city' => 'Durham',
-      'zone' => 'CZ',
-      'url' => 'http://mageia.supp.name',
+      'zone' => 'DE',
+      'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
     ),
   ),
   'NL' => 
@@ -110,19 +53,40 @@
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
   ),
-  'GR' => 
+  'CH' => 
   array (
     0 => 
     array (
-      'city' => 'Heraklion',
-      'zone' => 'GR',
-      'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
+      'city' => 'Lucern',
+      'zone' => 'CH',
+      'url' => 'ftp://ftp.LinuxCabal.org/pub/mirrors/Mageia',
     ),
     1 => 
     array (
-      'city' => 'Heraklion',
-      'zone' => 'GR',
-      'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
+      'city' => 'geneva',
+      'zone' => 'CH',
+      'url' => 'http://mageia.unige.ch/mirror',
+    ),
+  ),
+  'FR' => 
+  array (
+    0 => 
+    array (
+      'city' => 'Paris',
+      'zone' => 'FR',
+      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+    ),
+    1 => 
+    array (
+      'city' => 'Paris',
+      'zone' => 'FR',
+      'url' => 'https://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+    ),
+    2 => 
+    array (
+      'city' => 'Paris',
+      'zone' => 'FR',
+      'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
   ),
   'US' => 
@@ -133,20 +97,41 @@
       'zone' => 'US',
       'url' => 'http://distro.ibiblio.org/pub/linux/distributions/mageia',
     ),
+  ),
+  'CZ' => 
+  array (
+    0 => 
+    array (
+      'city' => 'Durham',
+      'zone' => 'CZ',
+      'url' => 'ftp://ftp.sh.cvut.cz/MIRRORS/mageia',
+    ),
     1 => 
     array (
       'city' => 'Durham',
-      'zone' => 'US',
-      'url' => 'ftp://distro.ibiblio.org/pub/linux/distributions/mageia',
+      'zone' => 'CZ',
+      'url' => 'http://mageia.supp.name',
+    ),
+    2 => 
+    array (
+      'city' => 'Erlangen',
+      'zone' => 'CZ',
+      'url' => 'http://ftp.sh.cvut.cz/MIRRORS/mageia',
     ),
   ),
-  'CN' => 
+  'GR' => 
   array (
     0 => 
     array (
-      'city' => 'Beijing',
-      'zone' => 'CN',
-      'url' => 'http://fundawang.lcuc.org.cn/mageia',
+      'city' => 'Heraklion',
+      'zone' => 'GR',
+      'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
+    ),
+    1 => 
+    array (
+      'city' => 'Heraklion',
+      'zone' => 'GR',
+      'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
   ),
   'NC' =>