* use uppercase letters for the country code

* change description of the lp mirror fetch tool

4 files changed, 103 insertions, 103 deletions

diff --git a/data/templates/Debian.mirrors b/data/templates/Debian.mirrors
index 44d63981..3e92cdc8 100644
--- a/data/templates/Debian.mirrors
+++ b/data/templates/Debian.mirrors
@@ -1,8 +1,8 @@
-#LOC:ar
+#LOC:AR
 http://debian.logiclinux.com/debian/
 ftp://ftp.ccc.uba.ar/pub/linux/debian/debian/
 http://ftp.ccc.uba.ar/pub/linux/debian/debian/
-#LOC:at
+#LOC:AT
 ftp://ftp.at.debian.org/debian/
 ftp://debian.sil.at/debian/
 ftp://ftp.debian.at/debian/
@@ -27,7 +27,7 @@ ftp://ftp.univie.ac.at/systems/linux/debian/debian/
 http://ftp.univie.ac.at/systems/linux/debian/debian/
 ftp://debian.inode.at/debian/
 http://debian.inode.at/debian/
-#LOC:au
+#LOC:AU
 ftp://ftp.wa.au.debian.org/debian/
 ftp://ftp.it.net.au/debian/
 ftp://poledra.it.net.au/debian/
@@ -56,7 +56,7 @@ ftp://mirror.datafast.net.au/debian/
 http://mirror.datafast.net.au/debian/
 http://mirror.optus.net/debian/
 http://mirror.optusnet.com.au/debian/
-#LOC:be
+#LOC:BE
 ftp://ftp.kulnet.kuleuven.ac.be/debian/
 http://ftp.kulnet.kuleuven.ac.be/debian/
 ftp://ftp.easynet.be/debian/
@@ -69,7 +69,7 @@ ftp://ftp.debian.skynet.be/debian/
 http://ftp.debian.skynet.be/ftp/debian/
 ftp://ftp.scarlet.be/pub/debian/
 http://ftp.scarlet.be/pub/debian/
-#LOC:bg
+#LOC:BG
 ftp://ftp.bg.debian.org/debian/
 ftp://debian.spnet.net/debian/
 http://ftp.bg.debian.org/debian/
@@ -82,7 +82,7 @@ ftp://ftp.uni-sofia.bg/debian/
 http://ftp.uni-sofia.bg/debian/
 ftp://debian.telecoms.bg/debian/
 http://debian.telecoms.bg/debian/
-#LOC:br
+#LOC:BR
 ftp://ftp.br.debian.org/debian/
 ftp://ftp.inf.ufpr.br/debian/
 ftp://www.inf.ufpr.br/debian/
@@ -105,12 +105,12 @@ http://seraph.las.ic.unicamp.br/pub/debian/
 http://ftp.las.ic.unicamp.br/pub/debian/
 http://debian.pop-sc.rnp.br/debian/
 http://mirror.pop-sc.rnp.br/debian/
-#LOC:by
+#LOC:BY
 ftp://linux.org.by/debian/
 http://linux.org.by/debian/
 ftp://ftp.mgts.by/debian/
 http://ftp.mgts.by/debian/
-#LOC:ca
+#LOC:CA
 http://debian.yorku.ca/debian/
 ftp://ftp3.nrc.ca/debian/
 http://ftp3.nrc.ca/debian/
@@ -127,7 +127,7 @@ http://debian.savoirfairelinux.net/debian/
 http://gpl.savoirfairelinux.net/debian/
 ftp://debian.mirror.iweb.ca/debian/
 http://debian.mirror.iweb.ca/debian/
-#LOC:ch
+#LOC:CH
 ftp://ftp.ch.debian.org/debian/
 ftp://debian.ethz.ch/debian/
 ftp://kaerpf.ethz.ch/debian/
@@ -136,9 +136,9 @@ http://debian.ethz.ch/debian/
 http://kaerpf.ethz.ch/debian/
 ftp://mirror.switch.ch/mirror/debian/
 http://mirror.switch.ch/ftp/mirror/debian/
-#LOC:cl
+#LOC:CL
 http://debian.ubiobio.cl/debian/
-#LOC:cn
+#LOC:CN
 ftp://ftp.linuxforum.net/debian/
 ftp://www2.linuxforum.net/debian/
 ftp://mirrors.geekbone.org/debian/
@@ -147,9 +147,9 @@ ftp://debian.cn99.com/debian/
 ftp://mirrors.cn99.com/debian/
 http://debian.cn99.com/debian/
 http://mirrors.cn99.com/debian/
-#LOC:co
+#LOC:CO
 http://fatboy.umng.edu.co/debian/
-#LOC:cz
+#LOC:CZ
 ftp://ftp.cz.debian.org/debian/
 ftp://ftp.debian.cz/debian/
 ftp://www.debian.cz/debian/
@@ -162,7 +162,7 @@ http://debian.sh.cvut.cz/debian/
 http://ftp.sh.cvut.cz/debian/
 ftp://ftp.zcu.cz/mirrors/debian/
 http://ftp.zcu.cz/mirrors/debian/
-#LOC:de
+#LOC:DE
 ftp://ftp.de.debian.org/debian/
 ftp://ftp1.de.debian.org/debian/
 ftp://debian.inf.tu-dresden.de/debian/
@@ -237,7 +237,7 @@ http://debian.vserver.de/debian/
 http://debian.plusserver.de/debian/
 ftp://debian.swordcoast.net/debian/
 http://debian.swordcoast.net/debian/
-#LOC:dk
+#LOC:DK
 ftp://ftp.dk.debian.org/debian/
 ftp://mirrors.dotsrc.org/debian/
 http://ftp.dk.debian.org/debian/
@@ -251,14 +251,14 @@ ftp://mirrors.telianet.dk/debian/
 ftp://mirrors.dk.telia.net/debian/
 http://mirrors.telianet.dk/debian/
 http://mirrors.dk.telia.net/debian/
-#LOC:ee
+#LOC:EE
 ftp://ftp.ee.debian.org/debian/
 ftp://ftp.linux.ee/debian/
 ftp://linux.ee/debian/
 http://ftp.ee.debian.org/debian/
 http://ftp.linux.ee/debian/
 http://linux.ee/debian/
-#LOC:es
+#LOC:ES
 ftp://ftp.es.debian.org/debian/
 ftp://ulises.adi.uam.es/debian/
 http://ftp.es.debian.org/debian/
@@ -275,7 +275,7 @@ ftp://ftp.gul.uc3m.es/debian/
 ftp://ftp.gul.es/debian/
 http://ftp.gul.uc3m.es/debian/
 http://ftp.gul.es/debian/
-#LOC:fi
+#LOC:FI
 ftp://ftp.fi.debian.org/debian/
 ftp://trumpetti.atm.tut.fi/debian/
 http://ftp.fi.debian.org/debian/
@@ -286,7 +286,7 @@ ftp://ftp.jyu.fi/debian/
 ftp://lennon.cc.jyu.fi/debian/
 http://ftp.jyu.fi/debian/
 http://lennon.cc.jyu.fi/debian/
-#LOC:fr
+#LOC:FR
 ftp://ftp.fr.debian.org/debian/
 ftp://debian.proxad.net/debian/
 ftp://ftpmirror.proxad.net/debian/
@@ -338,7 +338,7 @@ http://webb.ens-cachan.fr/debian/
 http://debian.ens-cachan.fr/debian/
 ftp://mirrors.ircam.fr/pub/debian/
 http://mirrors.ircam.fr/pub/debian/
-#LOC:gb
+#LOC:GB
 ftp://ftp.uk.debian.org/debian/
 ftp://debian.hands.com/debian/
 http://ftp.uk.debian.org/debian/
@@ -372,7 +372,7 @@ ftp://the.earth.li/debian/
 http://the.earth.li/debian/
 ftp://mirror.ox.ac.uk/debian/
 http://mirror.ox.ac.uk/debian/
-#LOC:gr
+#LOC:GR
 ftp://debian.otenet.gr/pub/linux/debian/
 http://debian.otenet.gr/debian/
 ftp://ftp.ntua.gr/pub/linux/debian/
@@ -385,13 +385,13 @@ http://ftp.softnet.tuc.gr/ftp/linux/debian/
 http://antirix.softnet.tuc.gr/ftp/linux/debian/
 ftp://debian.internet.gr/debian/
 http://debian.internet.gr/debian/
-#LOC:hk
+#LOC:HK
 ftp://ftp.hk.debian.org/debian/
 ftp://ftp.debian.org.hk/debian/
 http://ftp.hk.debian.org/debian/
 http://ftp.debian.org.hk/debian/
 http://www.zentek-international.com/mirrors/debian/
-#LOC:hr
+#LOC:HR
 ftp://ftp.hr.debian.org/debian/
 ftp://debian.carnet.hr/debian/
 http://ftp.hr.debian.org/debian/
@@ -402,7 +402,7 @@ ftp://ftp.carnet.hr/debian/
 http://ftp.carnet.hr/debian/
 ftp://debian.iskon.hr/debian/
 http://debian.iskon.hr/debian/
-#LOC:hu
+#LOC:HU
 ftp://ftp.hu.debian.org/debian/
 ftp://ftp.fsn.hu/debian/
 http://ftp.hu.debian.org/debian/
@@ -411,7 +411,7 @@ ftp://debian.inf.elte.hu/debian/
 http://debian.inf.elte.hu/debian/
 ftp://ftp.bme.hu/OS/Linux/dist/debian/
 http://ftp.bme.hu/OS/Linux/dist/debian/
-#LOC:id
+#LOC:ID
 ftp://kebo.vlsm.org/debian/
 ftp://surabaya.vlsm.org/debian/
 ftp://katmai.its.ac.id/debian/
@@ -419,7 +419,7 @@ http://kebo.vlsm.org/debian/
 http://surabaya.vlsm.org/debian/
 http://katmai.its.ac.id/debian/
 http://debian.indika.net.id/debian/
-#LOC:ie
+#LOC:IE
 ftp://ftp.ie.debian.org/debian/
 ftp://debian.heanet.ie/debian/
 ftp://debian.ipv6.heanet.ie/debian/
@@ -430,17 +430,17 @@ http://debian.ipv6.heanet.ie/debian/
 http://canyonero.heanet.ie/debian/
 ftp://ftp.esat.net/pub/linux/debian/
 http://ftp.esat.net/pub/linux/debian/
-#LOC:il
+#LOC:IL
 http://mirror.hamakor.org.il/pub/mirrors/debian/
-#LOC:in
+#LOC:IN
 ftp://ftp.iitm.ac.in/debian/
 http://ftp.iitm.ac.in/debian/
-#LOC:is
+#LOC:IS
 ftp://ftp.is.debian.org/debian/
 ftp://ftp.rhnet.is/debian/
 http://ftp.is.debian.org/debian/
 http://ftp.rhnet.is/debian/
-#LOC:it
+#LOC:IT
 ftp://ftp.it.debian.org/debian/
 ftp://ftp.bofh.it/debian/
 ftp://vlad-tepes.bofh.it/debian/
@@ -462,7 +462,7 @@ ftp://debian.fastbull.org/debian/
 ftp://bull02.fastbull.org/debian/
 http://debian.fastbull.org/debian/
 http://bull02.fastbull.org/debian/
-#LOC:jp
+#LOC:JP
 ftp://ftp.jp.debian.org/debian/
 ftp://ftp.nara.wide.ad.jp/debian/
 ftp://ftp.aist-nara.ac.jp/debian/
@@ -502,27 +502,27 @@ http://www.ring.gr.jp/archives/linux/debian/debian/
 http://ftp.ring.gr.jp/archives/linux/debian/debian/
 ftp://ftp.jaist.ac.jp/pub/Linux/Debian/
 http://ftp.jaist.ac.jp/pub/Linux/Debian/
-#LOC:kr
+#LOC:KR
 ftp://ftp.kr.debian.org/debian/
 ftp://ftp.kaist.ac.kr/debian/
 http://ftp.kr.debian.org/debian/
 http://ftp.kaist.ac.kr/debian/
-#LOC:lt
+#LOC:LT
 ftp://ameba.sc-uni.ktu.lt/debian/
 http://ameba.sc-uni.ktu.lt/debian/
 ftp://debian.balt.net/debian/
 http://debian.balt.net/debian/
-#LOC:lv
+#LOC:LV
 ftp://ftp.latnet.lv/linux/debian/
 ftp://milzis.latnet.lv/linux/debian/
 http://ftp.latnet.lv/linux/debian/
 http://milzis.latnet.lv/linux/debian/
-#LOC:mx
+#LOC:MX
 ftp://nisamox.fciencias.unam.mx/debian/
 http://nisamox.fciencias.unam.mx/debian/
-#LOC:ni
+#LOC:NI
 http://debian.uni.edu.ni/debian/
-#LOC:nl
+#LOC:NL
 ftp://ftp.nl.debian.org/debian/
 ftp://slagroom.snt.utwente.nl/debian/
 http://ftp.nl.debian.org/debian/
@@ -541,19 +541,19 @@ ftp://ftp.tiscali.nl/pub/mirrors/debian/
 http://ftp.tiscali.nl/debian/
 ftp://debian.essentkabel.com/debian/
 http://debian.essentkabel.com/debian/
-#LOC:no
+#LOC:NO
 ftp://ftp.no.debian.org/debian/
 ftp://ftp.uninett.no/debian/
 http://ftp.no.debian.org/debian/
 http://ftp.uninett.no/debian/
-#LOC:nz
+#LOC:NZ
 ftp://ftp.nz.debian.org/debian/
 ftp://ftp.citylink.co.nz/debian/
 http://ftp.nz.debian.org/debian/
 http://ftp.citylink.co.nz/debian/
 ftp://debian.ihug.co.nz/debian/
 http://debian.ihug.co.nz/debian/
-#LOC:pl
+#LOC:PL
 ftp://ftp.pl.debian.org/debian/
 ftp://ftp.task.gda.pl/debian/
 http://ftp.pl.debian.org/debian/
@@ -564,7 +564,7 @@ http://ftp.icm.edu.pl/pub/Linux/debian/
 http://sunsite.icm.edu.pl/pub/Linux/debian/
 ftp://ftp.man.szczecin.pl/pub/Linux/debian/
 ftp://rubycon.man.szczecin.pl/pub/Linux/debian/
-#LOC:pt
+#LOC:PT
 ftp://ftp.uevora.pt/debian/
 ftp://khaverna.sc.uevora.pt/debian/
 http://ftp.uevora.pt/debian/
@@ -577,14 +577,14 @@ http://debian.ua.pt/debian/
 http://ftp.ua.pt/debian/
 ftp://ftp.linux.pt/pub/mirrors/debian/
 http://ftp.linux.pt/pub/mirrors/debian/
-#LOC:ro
+#LOC:RO
 ftp://ftp.ro.debian.org/debian/
 ftp://ftp.iasi.roedu.net/debian/
 http://ftp.ro.debian.org/debian/
 http://ftp.iasi.roedu.net/debian/
 ftp://ftp.lug.ro/debian/
 http://ftp.lug.ro/debian/
-#LOC:ru
+#LOC:RU
 ftp://ftp.ru.debian.org/debian/
 ftp://ftp.chg.ru/debian/
 http://ftp.ru.debian.org/debian/
@@ -603,7 +603,7 @@ ftp://ftp.corbina.ru/pub/Linux/debian/
 ftp://earth.corbina.net/pub/Linux/debian/
 ftp://ftp.mipt.ru/debian/
 ftp://petrel.telecom.mipt.ru/debian/
-#LOC:se
+#LOC:SE
 ftp://ftp.se.debian.org/debian/
 ftp://ftp.acc.umu.se/debian/
 http://ftp.se.debian.org/debian/
@@ -616,14 +616,14 @@ ftp://ftp.port80.se/debian/
 http://ftp.port80.se/debian/
 ftp://ftp.ds.hj.se/pub/os/linux/debian/
 http://ftp.ds.hj.se/pub/os/linux/debian/
-#LOC:sg
+#LOC:SG
 ftp://mirror.nus.edu.sg/pub/Debian/
 ftp://mirror.comp.nus.edu.sg/pub/Debian/
 http://mirror.nus.edu.sg/Debian/
 http://mirror.comp.nus.edu.sg/Debian/
 ftp://debian.wow-vision.com.sg/debian/
 http://debian.wow-vision.com.sg/debian/
-#LOC:si
+#LOC:SI
 ftp://ftp.si.debian.org/debian/
 ftp://ftp.camtp.uni-mb.si/debian/
 ftp://debian.camtp.uni-mb.si/debian/
@@ -631,21 +631,21 @@ http://ftp.si.debian.org/debian/
 http://ftp.camtp.uni-mb.si/debian/
 http://debian.camtp.uni-mb.si/debian/
 ftp://ftp.arnes.si/packages/debian/
-#LOC:sk
+#LOC:SK
 ftp://ftp.sk.debian.org/debian/
 ftp://ftp.tuke.sk/debian/
 ftp://ccfrog.ke.sanet.sk/debian/
 http://ftp.sk.debian.org/debian/
 http://ftp.tuke.sk/debian/
 http://ccfrog.ke.sanet.sk/debian/
-#LOC:th
+#LOC:TH
 ftp://ftp.nectec.or.th/pub/linux-distributions/Debian/
 ftp://download.nectec.or.th/pub/linux-distributions/Debian/
 ftp://ftp.coe.psu.ac.th/debian/
 ftp://debian.coe.psu.ac.th/debian/
 http://ftp.coe.psu.ac.th/debian/
 http://debian.coe.psu.ac.th/debian/
-#LOC:tr
+#LOC:TR
 ftp://ftp.tr.debian.org/debian/
 ftp://debian.ankara.edu.tr/debian/
 ftp://ftp.ankara.edu.tr/debian/
@@ -653,7 +653,7 @@ http://ftp.tr.debian.org/debian/
 http://debian.ankara.edu.tr/debian/
 http://ftp.ankara.edu.tr/debian/
 ftp://ftp.linux.org.tr/pub/mirrors/debian/
-#LOC:tw
+#LOC:TW
 ftp://ftp.tw.debian.org/debian/
 ftp://debian.linux.org.tw/debian/
 http://ftp.tw.debian.org/debian/
@@ -670,7 +670,7 @@ http://debian.nctu.edu.tw/debian/
 http://debian.ntcu.net/debian/
 ftp://mirror.nttu.edu.tw/debian/
 http://mirror.nttu.edu.tw/debian/
-#LOC:ua
+#LOC:UA
 ftp://debian.osdn.org.ua/pub/Debian/debian/
 http://debian.osdn.org.ua/debian/
 ftp://debian.org.ua/debian/
@@ -680,7 +680,7 @@ http://debian.org.ua/debian/
 http://mirror.3logic.net/debian/
 http://mirror.debian.org.ua/debian/
 ftp://ftp.3logic.net/debian/
-#LOC:us
+#LOC:US
 ftp://ftp.us.debian.org/debian/
 ftp://http.us.debian.org/debian/
 http://ftp.us.debian.org/debian/
@@ -788,9 +788,9 @@ ftp://debian.mirror.frontiernet.net/debian/
 http://debian.mirror.frontiernet.net/debian/
 ftp://cudlug.cudenver.edu/debian/
 http://cudlug.cudenver.edu/debian/
-#LOC:ve
+#LOC:VE
 http://debian.unesr.edu.ve/debian/
-#LOC:za
+#LOC:ZA
 ftp://ftp.sun.ac.za/debian/
 ftp://archive.sun.ac.za/debian/
 http://ftp.sun.ac.za/ftp/debian/
diff --git a/data/templates/Ubuntu.mirrors b/data/templates/Ubuntu.mirrors
index 6d75ea4e..72b2b434 100644
--- a/data/templates/Ubuntu.mirrors
+++ b/data/templates/Ubuntu.mirrors
@@ -1,27 +1,27 @@
-#LOC:au
+#LOC:AU
 http://mirror.optus.net/ubuntu/
 http://mirror.pacific.net.au/linux/ubuntu
-#LOC:at
+#LOC:AT
 http://ubuntu.inode.at/ubuntu/
 ftp://ubuntu.inode.at/ubuntu/
 rsync://ubuntu.inode.at/ubuntu/ubuntu/
 http://gd.tuwien.ac.at/opsys/linux/ubuntu/archive/
-#LOC:be
+#LOC:BE
 http://ftp.belnet.be/linux/ubuntu/ubuntu/
 http://ubuntu.mirrors.skynet.be/pub/ubuntu.com/ubuntu/
-#LOC:br
+#LOC:BR
 http://br.archive.ubuntu.com/ubuntu/
 ftp://br.archive.ubuntu.com/ubuntu/
 rsync://br.archive.ubuntu.com/ubuntu/
 http://espelhos.edugraf.ufsc.br/ubuntu/
 http://ubuntu.c3sl.ufpr.br/ubuntu/
-#LOC:bg
+#LOC:BG
 http://ubuntu.linux-bg.org/ubuntu/
 ftp://ubuntu.linux-bg.org/ubuntu/
 rsync://ubuntu.linux-bg.org::ubuntu
 http://ubuntu.ipacct.com/ubuntu/
 ftp://ubuntu.ipacct.com/ubuntu/
-#LOC:ca
+#LOC:CA
 http://gulus.USherbrooke.ca/ubuntu/
 ftp://gulus.USherbrooke.ca/ubuntu/
 http://mirror.cpsc.ucalgary.ca/mirror/ubuntu.com/
@@ -32,40 +32,40 @@ ftp://ftp.cs.mun.ca/pub/mirror/ubuntu/
 http://gulus.usherbrooke.ca/pub/distro/ubuntu/
 http://mirror.arcticnetwork.ca/pub/ubuntu/packages
 http://ubuntu.mirror.rafal.ca/ubuntu/
-#LOC:cl
+#LOC:CL
 http://cl.archive.ubuntu.com/ubuntu/
 ftp://cl.archive.ubuntu.com/ubuntu/
 rsync://cl.archive.ubuntu.com/ubuntu/
-#LOC:cn
+#LOC:CN
 http://ubuntu.cn99.com/ubuntu/
 http://mirror.lupaworld.com/ubuntu/archive/
-#LOC:cr
+#LOC:CR
 http://ftp.ucr.ac.cr/ubuntu/
-#LOC:hr
+#LOC:HR
 http://hr.archive.ubuntu.com/ubuntu
 ftp://hr.archive.ubuntu.com/ubuntu
 rsync://hr.archive.ubuntu.com/ubuntu
-#LOC:cz
+#LOC:CZ
 http://ubuntu.supp.name/ubuntu/
 http://ubuntu.sh.cvut.cz/
 http://ubuntu.supp.name/ubuntu
-#LOC:dk
+#LOC:DK
 http://dk.archive.ubuntu.com/ubuntu/
 http://klid.dk/ftp/ubuntu/
 ftp://klid.dk/ubuntu
 http://mirror.uni-c.dk/ubuntu/
 http://mirrors.dotsrc.org/ubuntu
-#LOC:ee
+#LOC:EE
 http://ftp.estpak.ee/ubuntu/
 ftp://ftp.estpak.ee/ubuntu/
 rsync://ftp.estpak.ee/ubuntu/
 http://ftp.estpak.ee/pub/ubuntu/
-#LOC:fi
+#LOC:FI
 http://www.nic.funet.fi/pub/mirrors/archive.ubuntu.com/
 ftp://ftp.funet.fi/pub/mirrors/archive.ubuntu.com/
 rsync://rsync.nic.funet.fi/ftp/pub/mirrors/archive.ubuntu.com/
 http://mirrors.nic.funet.fi/ubuntu/
-#LOC:fr
+#LOC:FR
 ftp://ftp.free.fr/mirrors/ftp.ubuntu.com/ubuntu/
 ftp://ftp.free.fr/mirrors/ftp.ubuntu.com/ubuntu/
 http://ftp.crihan.fr/ubuntu
@@ -80,9 +80,9 @@ ftp://ubuntu.univ-nantes.fr/ubuntu
 http://ftp.crihan.fr/mirrors/archive.ubuntu.com/
 ftp://ftp.free.fr/mirrors/ftp.ubuntu.com/ubuntu
 ftp://ftp.free.fr/mirrors/ftp.ubuntu.com/ubuntu
-#LOC:ge
+#LOC:GE
 http://ubuntu.eriders.ge/ubuntu
-#LOC:de
+#LOC:DE
 http://ubuntu.intergenia.de/ubuntu/
 rsync://ubuntu.intergenia.de/ubuntu-linux/ubuntu/
 ftp://ftp.fu-berlin.de/linux/ubuntu/
@@ -101,7 +101,7 @@ http://ftp.stw-bonn.de/ubuntu
 http://ftp.tu-chemnitz.de/pub/linux/ubuntu/
 http://ftp.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu/
 http://snert.mi.hs-heilbronn.de/pub/ubuntu/ubuntu/
-#LOC:gr
+#LOC:GR
 http://ftp.duth.gr/pub/ubuntu/
 ftp://ftp.duth.gr/pub/ubuntu/
 rsync://ftp.duth.gr/ubuntu/
@@ -109,40 +109,40 @@ http://ftp.ntua.gr/pub/linux/ubuntu/
 ftp://ftp.ntua.gr/pub/linux/ubuntu/
 http://gr.archive.ubuntu.com/ubuntu/
 ftp://gr.archive.ubuntu.com/ubuntu/
-#LOC:hu
+#LOC:HU
 ftp://ftp.fsn.hu/pub/linux/distributions/ubuntu
 ftp://ftp.fsn.hu/pub/linux/distributions/ubuntu
-#LOC:is
+#LOC:IS
 http://ubuntu.lhi.is/ubuntu
-#LOC:ie
+#LOC:IE
 http://ie.archive.ubuntu.com/ubuntu/
 ftp://ie.archive.ubuntu.com/ubuntu/
 rsync://ie.archive.ubuntu.com/ubuntu/
 http://ftp.esat.net/mirrors/archive.ubuntu.com/
 http://ftp.heanet.ie/pub/ubuntu/
-#LOC:it
+#LOC:IT
 http://na.mirror.garr.it/mirrors/ubuntu-archive/
 ftp://na.mirror.garr.it/mirrors/ubuntu-archive/
 rsync://na.mirror.garr.it::ubuntu-archive/
 http://ubuntu.fastbull.org/ubuntu/
 ftp://ubuntu.fastbull.org/ubuntu/
 http://na.mirror.garr.it/mirrors/ubuntu-archive
-#LOC:jp
+#LOC:JP
 http://ftp.ecc.u-tokyo.ac.jp/ubuntu/
-#LOC:kr
+#LOC:KR
 http://kr.archive.ubuntu.com/ubuntu/
 ftp://kr.archive.ubuntu.com/ubuntu/
 rsync://kr.archive.ubuntu.com/ubuntu
 http://ftp.kaist.ac.kr/pub/ubuntu
 http://mirror.letsopen.com/os/ubuntu
-#LOC:lv
+#LOC:LV
 http://ftp.linux.edu.lv/ubuntu/
-#LOC:lt
+#LOC:LT
 http://ftp.litnet.lt/pub/ubuntu
-#LOC:mn
+#LOC:MN
 http://archive.mnosi.org/ubuntu/
 ftp://archive.mnosi.org/ubuntu/
-#LOC:nl
+#LOC:NL
 http://nl.archive.ubuntu.com/ubuntu/
 ftp://nl.archive.ubuntu.com/ubuntu/
 rsync://nl.archive.ubuntu.com/ubuntu/
@@ -153,9 +153,9 @@ ftp://ftp.tudelft.nl/pub/Linux/archive.ubuntu.com/
 ftp://ftpserv.tudelft.nl/pub/Linux/archive.ubuntu.com/
 ftp://ftpserv.tudelft.nl/pub/Linux/archive.ubuntu.com/
 http://ubuntu.bit.nl/ubuntu/
-#LOC:nz
+#LOC:NZ
 http://ftp.citylink.co.nz/ubuntu/
-#LOC:no
+#LOC:NO
 http://ftp.uninett.no/ubuntu/
 ftp://ftp.uninett.no/ubuntu/
 rsync://ftp.uninett.no/ubuntu/
@@ -166,14 +166,14 @@ ftp://no.archive.ubuntu.com/ubuntu
 ftp://ftp.uninett.no/linux/ubuntu
 ftp://ftp.uninett.no/linux/ubuntu
 http://mirror.trivini.no/ubuntu/
-#LOC:pl
+#LOC:PL
 http://ftp.vectranet.pl/ubuntu
 ftp://ftp.vectranet.pl/ubuntu
 rsync://ftp.vectranet.pl/ubuntu
 ftp://ftp.man.szczecin.pl/pub/Linux/ubuntu/
 ftp://ftp.man.szczecin.pl/pub/Linux/ubuntu/
 http://ubuntu.task.gda.pl/ubuntu/
-#LOC:pt
+#LOC:PT
 http://ftp.dei.uc.pt/pub/linux/ubuntu/archive/
 ftp://ftp.dei.uc.pt/pub/linux/ubuntu/archive/
 http://ubuntu.dcc.fc.up.pt/
@@ -181,40 +181,40 @@ http://ftp.gil.di.uminho.pt/ubuntu/
 ftp://ftp.gil.di.uminho.pt/ubuntu/
 rsync://ftp.gil.di.uminho.pt/ubuntu/
 http://ubuntu.dcc.fc.up.pt
-#LOC:ro
+#LOC:RO
 http://ftp.lug.ro/ubuntu/
-#LOC:ru
+#LOC:RU
 http://ftp.chg.ru/pub/Linux/ubuntu/archive/
-#LOC:cs
+#LOC:CS
 http://yu.archive.ubuntu.com/ubuntu
 ftp://yu.archive.ubuntu.com/ubuntu
 rsync://yu.archive.ubuntu.com/ubuntu
 http://mirror.etf.bg.ac.yu/distributions/ubuntu/ubuntu-archive/
 http://mirror2.etf.bg.ac.yu/distributions/ubuntu/ubuntu-archive/
-#LOC:sk
+#LOC:SK
 http://ubuntu.ynet.sk/ubuntu/
-#LOC:za
+#LOC:ZA
 http://ubuntu.mirror.ac.za/
 ftp://ubuntu.mirror.ac.za
 rsync://ubuntu.mirror.ac.za/Ubuntu
 http://ftp.leg.uct.ac.za/pub/linux/ubuntu/
 ftp://ftp.leg.uct.ac.za/pub/linux/ubuntu/
 rsync://ftp.leg.uct.ac.za/pub/linux/ubuntu/
-#LOC:es
+#LOC:ES
 http://ftp.gui.uva.es/sites/ubuntu.com/ubuntu/
 ftp://ftp.um.es/mirror/ubuntu/
 ftp://ftp.um.es/mirror/ubuntu/
-#LOC:se
+#LOC:SE
 http://se.archive.ubuntu.com/ubuntu/
 ftp://se.archive.ubuntu.com/ubuntu/
 rsync://se.archive.ubuntu.com/ubuntu/
 http://ftp.ds.karen.hj.se/pub/os/linux/ubuntu/
 ftp://ftp.ds.karen.hj.se/pub/os/linux/ubuntu/
 http://ftp.port80.se/ubuntu/
-#LOC:ch
+#LOC:CH
 http://mirror.switch.ch/ftp/mirror/ubuntu/
 ftp://mirror.switch.ch/mirror/ubuntu/
-#LOC:tw
+#LOC:TW
 http://ftp.cse.yzu.edu.tw/pub/Linux/Ubuntu/ubuntu/
 ftp://ftp.cse.yzu.edu.tw/pub/Linux/Ubuntu/ubuntu/
 http://ftp.twaren.net/Linux/Ubuntu/ubuntu/
@@ -226,7 +226,7 @@ ftp://tw.archive.ubuntu.com/ubuntu
 rsync://tw.archive.ubuntu.com/ubuntu
 http://debian.linux.org.tw/ubuntu
 http://ftp.cse.yzu.edu.tw/ubuntu/
-#LOC:gb
+#LOC:GB
 http://www.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/
 ftp://ftp.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/
 rsync://rsync.mirrorservice.org/archive.ubuntu.com/ubuntu/
@@ -236,7 +236,7 @@ rsync://archive.ubuntu.com/ubuntu
 http://ftp.ticklers.org/archive.ubuntu.org/ubuntu/
 ftp://ftp.ticklers.org/archive.ubuntu.org/ubuntu/
 rsync://ftp0.ticklers.org/archive.ubuntu.org/ubuntu/
-#LOC:us
+#LOC:US
 http://mirror.anl.gov/pub/ubuntu/
 ftp://mirror.anl.gov/pub/ubuntu/
 rsync://mirror.anl.gov/ubuntu/
@@ -261,7 +261,7 @@ http://mirrors.cs.wmich.edu/ubuntu/
 http://tamago.cs.ucr.edu/ubuntu/ubuntu/
 http://ubuntu.cs.utah.edu/ubuntu
 http://ubuntu.secs.oakland.edu/
-#LOC:uz
+#LOC:UZ
 http://ubuntu.uz/ubuntu/
 http://ubuntu.snet.uz/ubuntu/
 ftp://ubuntu.snet.uz/ubuntu/
diff --git a/utils/get_debian_mirrors.py b/utils/get_debian_mirrors.py
index f722e82d..ccddf8ed 100755
--- a/utils/get_debian_mirrors.py
+++ b/utils/get_debian_mirrors.py
@@ -51,7 +51,7 @@ try:
         if line.startswith('<strong><a name="'):
             location = match_location.sub(r"\1", line)
             if location:
-                mirrors.append("#LOC:%s" % location.lower())
+                mirrors.append("#LOC:%s" % location)
         if line.startswith("Site:"):
             sites = line[6:-1].split(",")
         elif line.startswith('Packages over HTTP'):
diff --git a/utils/get_ubuntu_lp_mirrors.py b/utils/get_ubuntu_lp_mirrors.py
index b91ae533..fad495b5 100755
--- a/utils/get_ubuntu_lp_mirrors.py
+++ b/utils/get_ubuntu_lp_mirrors.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 #
-#  get_ubuntu_mirrors.py
+#  get_ubuntu_lp_mirrors.py
 #
-#  Download the latest list with available mirrors from the Ubuntu
-#  wiki and extract the hosts from the raw page
+#  Download the latest list with available Ubuntu mirrors from Launchpad.net
+#  and extract the hosts from the raw page
 #
 #  Copyright (c) 2006 Free Software Foundation Europe
 #
@@ -70,7 +70,7 @@ def find(split):
     urls = re.findall(r'<a href="(?![a-zA-Z:/_\-]+launchpad.+?">)(.+?)">',
                       split)
     if countries.has_key(country.group(1)):
-        lines.append("#LOC:%s" % countries[country.group(1)])
+        lines.append("#LOC:%s" % countries[country.group(1)].upper())
     else:
         lines.append("#LOC:%s" % country.group(1))
     map(lines.append, urls)