diff --git a/data/other/servers.xml b/data/other/servers.xml
index bdfc9ca1f31076868547be76da80c7febb69fcfa..4e0097b9ddc84ed97d494b1595094b1fe01a178c 100644
--- a/data/other/servers.xml
+++ b/data/other/servers.xml
@@ -5,373 +5,365 @@
http://www.jabber.org/jeps/jep-0030.html
To add your server to the list, contact stpeter@jabber.org -->
-
-<query xmlns='http://jabber.org/protocol/disco#items'>
- <item jid='12jabber.com' name='Jabber server hosted by Anywise.com'>
- <active port='5222'/>
- </item>
- <item jid='admin-networks.org' name=''>
- <active port='5222'/>
+<query xmlns="http://jabber.org/protocol/disco#items">
+ <item jid="12jabber.com" name="Jabber server hosted by Anywise.com">
+ <active port="5222"/>
</item>
- <item jid='akl.lt' name='Jabber server in Lietuva (Lithuania)'>
- <active port='5222'/>
+ <item jid="admin-networks.org" name="">
+ <active port="5222"/>
</item>
- <item jid='amber.org.uk' name=''>
- <active port='5222'/>
+ <item jid="akl.lt" name="Jabber server in Lietuva (Lithuania)">
+ <active port="5222"/>
</item>
- <item jid='amessage.at' name='Austrian Jabber server'>
- <active port='5222'/>
+ <item jid="amber.org.uk" name="">
+ <active port="5222"/>
</item>
- <item jid='amessage.be' name='Belgian Jabber server'>
- <active port='5222'/>
+ <item jid="amessage.at" name="Austrian Jabber server">
+ <active port="5222"/>
</item>
- <item jid='amessage.ch' name='Swiss Jabber server'>
- <active port='5222'/>
+ <item jid="amessage.be" name="Belgian Jabber server">
+ <active port="5222"/>
</item>
- <item jid='amessage.de' name='German Jabber server'>
- <active port='5222'/>
+ <item jid="amessage.ch" name="Swiss Jabber server">
+ <active port="5222"/>
</item>
- <item jid='amessage.info' name='Jabber server from amessage'>
- <active port='5222'/>
+ <item jid="amessage.de" name="German Jabber server">
+ <active port="5222"/>
</item>
- <item jid='amessage.li' name='Jabber server in Liechtenstein'>
- <active port='5222'/>
+ <item jid="amessage.info" name="Jabber server from amessage">
+ <active port="5222"/>
</item>
- <item jid='aszlig.net' name=''>
- <active port='5222'/>
+ <item jid="amessage.li" name="Jabber server in Liechtenstein">
+ <active port="5222"/>
</item>
- <item jid='bloodyxml.com' name='Hosted by Chote Networks (http://www.chote.com)'>
- <active port='5222'/>
+ <item jid="aszlig.net" name="">
+ <active port="5222"/>
</item>
- <item jid='borderlinenormal.com' name='Hosted by Chote Networks (http://www.chote.com)'>
- <active port='5222'/>
+ <item jid="bloodyxml.com" name="Hosted by Chote Networks (http://www.chote.com)">
+ <active port="5222"/>
</item>
- <item jid='bulmalug.net' name='Server hosted by the Linux Users Group of the Balearic Islands'>
- <active port='5222'/>
+ <item jid="borderlinenormal.com" name="Hosted by Chote Networks (http://www.chote.com)">
+ <active port="5222"/>
</item>
- <item jid='chat.mail2web.com' name=''>
- <active port='5222'/>
+ <item jid="bulmalug.net" name="Server hosted by the Linux Users Group of the Balearic Islands">
+ <active port="5222"/>
</item>
- <item jid='default.co.yu' name='Server in Yugoslavia'>
- <active port='5222'/>
+ <item jid="chat.mail2web.com" name="">
+ <active port="5222"/>
</item>
- <item jid='deshalbfrei.org' name=''>
- <active port='5222'/>
+ <item jid="default.co.yu" name="Server in Yugoslavia">
+ <active port="5222"/>
</item>
- <item jid='develog.com' name=''>
- <active port='5222'/>
+ <item jid="deshalbfrei.org" name="">
+ <active port="5222"/>
</item>
- <item jid='dhbit.ca' name='Visit http://dhbit.ca/article.php?sid=318 for more information'>
- <active port='5222'/>
+ <item jid="develog.com" name="">
+ <active port="5222"/>
</item>
- <item jid='dotgeek.org' name='Jabber server in Switzerland'>
- <active port='5222'/>
+ <item jid="dotgeek.org" name="Jabber server in Switzerland">
+ <active port="5222"/>
</item>
- <item jid='es.tipic.com' name='Spanish Jabber server hosted by Tipic'>
- <active port='5222'/>
+ <item jid="es.tipic.com" name="Spanish Jabber server hosted by Tipic">
+ <active port="5222"/>
</item>
- <item jid='foxalpha.de' name=''>
- <active port='5222'/>
+ <item jid="foxalpha.de" name="">
+ <active port="5222"/>
</item>
- <item jid='here.dk' name='Jabber server in Denmark'>
- <active port='5222'/>
+ <item jid="here.dk" name="Jabber server in Denmark">
+ <active port="5222"/>
</item>
- <item jid='illx.org' name='Jabber server hosted by illx.org'>
- <active port='5222'/>
+ <item jid="illx.org" name="Jabber server hosted by illx.org">
+ <active port="5222"/>
</item>
- <item jid='im.apinc.org' name='French server hosted by APINC'>
- <active port='5222'/>
+ <item jid="im.flosoft.biz" name="">
+ <active port="5222"/>
</item>
- <item jid='im.flosoft.biz' name=''>
- <active port='5222'/>
+ <item jid="ims.kelkoo.net" name="Server hosted by Kelkoo (France)">
+ <active port="5222"/>
</item>
- <item jid='ims.kelkoo.net' name='Server hosted by Kelkoo (France)'>
- <active port='5222'/>
+ <item jid="jabber-fr.net" name="French Jabber server">
+ <active port="5222"/>
</item>
- <item jid='jabber-fr.net' name='French Jabber server'>
- <active port='5222'/>
+ <item jid="jabber-hispano.org" name="Servidor Jabber de la comunidad hispana">
+ <active port="5222"/>
</item>
- <item jid='jabber-hispano.org' name='Servidor Jabber de la comunidad hispana'>
- <active port='5222'/>
+ <item jid="jabber.3gnt.org" name="Server in Portugal">
+ <active port="5222"/>
</item>
- <item jid='jabber.3gnt.org' name='Server in Portugal'>
- <active port='5222'/>
+ <item jid="jabber.ambrero.nl" name="">
+ <active port="5222"/>
</item>
- <item jid='jabber.ambrero.nl' name=''>
- <active port='5222'/>
+ <item jid="jabber.anywise.com" name="Jabber server hosted by Anywise.com">
+ <active port="5222"/>
</item>
- <item jid='jabber.anywise.com' name='Jabber server hosted by Anywise.com'>
- <active port='5222'/>
+ <item jid="jabber.atman.pl" name="Another server in Poland">
+ <active port="5222"/>
</item>
- <item jid='jabber.atman.pl' name='Another server in Poland'>
- <active port='5222'/>
+ <item jid="jabber.autocom.pl" name="Server associated with jabberpl.org">
+ <active port="5222"/>
</item>
- <item jid='jabber.autocom.pl' name='Server associated with jabberpl.org'>
- <active port='5222'/>
+ <item jid="jabber.bettercom.de" name="Public server hosted by BetterCom">
+ <active port="5222"/>
</item>
- <item jid='jabber.bettercom.de' name='Public server hosted by BetterCom'>
- <active port='5222'/>
+ <item jid="jabber.cc" name="">
+ <active port="5222"/>
</item>
- <item jid='jabber.cc' name=''>
- <active port='5222'/>
+ <item jid="jabber.ccc.de" name="Service of the Chaos Computer Club">
+ <active port="5222"/>
</item>
- <item jid='jabber.ccc.de' name='Service of the Chaos Computer Club'>
- <active port='5222'/>
+ <item jid="jabber.cd.chalmers.se" name="">
+ <active port="5222"/>
</item>
- <item jid='jabber.cd.chalmers.se' name=''>
- <active port='5222'/>
+ <item jid="jabber.cn" name="Jabber server for all of China! :-)">
+ <active port="5222"/>
</item>
- <item jid='jabber.cn' name='Jabber server for all of China! :-)'>
- <active port='5222'/>
+ <item jid="jabber.com" name="Jabber server offered by Jabber, Inc.">
+ <active port="5222"/>
</item>
- <item jid='jabber.com' name='Jabber server offered by Jabber, Inc.'>
- <active port='5222'/>
+ <item jid="jabber.com.cn" name="Jabber server in China">
+ <active port="5222"/>
</item>
- <item jid='jabber.com.cn' name='Jabber server in China'>
- <active port='5222'/>
+ <item jid="jabber.cz" name="Czech Jabber server">
+ <active port="5222"/>
</item>
- <item jid='jabber.cz' name='Czech Jabber server'>
- <active port='5222'/>
+ <item jid="jabber.dk" name="Jabber server in Denmark">
+ <active port="5222"/>
</item>
- <item jid='jabber.dk' name='Jabber server in Denmark'>
- <active port='5222'/>
+ <item jid="jabber.earth.li" name="Jabber server hosted by earth.li">
+ <active port="5222"/>
</item>
- <item jid='jabber.earth.li' name='Jabber server hosted by earth.li'>
- <active port='5222'/>
+ <item jid="jabber.evilrealms.net" name="">
+ <active port="5222"/>
</item>
- <item jid='jabber.evilrealms.net' name=''>
- <active port='5222'/>
+ <item jid="jabber.felisberto.net" name="Server in Portugal">
+ <active port="5222"/>
</item>
- <item jid='jabber.felisberto.net' name='Server in Portugal'>
- <active port='5222'/>
+ <item jid="jabber.fr" name="">
+ <active port="5222"/>
</item>
- <item jid='jabber.fr' name='French server hosted by APINC'>
- <active port='5222'/>
+ <item jid="jabber.freenet.de" name="Server in Germany">
+ <active port="5222"/>
</item>
- <item jid='jabber.freenet.de' name='Server in Germany'>
- <active port='5222'/>
+ <item jid="jabber.hot-chilli.net" name="">
+ <active port="5222"/>
</item>
- <item jid='jabber.hot-chilli.net' name=''>
- <active port='5222'/>
+ <item jid="jabber.hu" name="Jabber server in Hungary">
+ <active port="5222"/>
</item>
- <item jid='jabber.hu' name='Jabber server in Hungary'>
- <active port='5222'/>
+ <item jid="jabber.i-pobox.net" name="Server in Germany">
+ <active port="5222"/>
</item>
- <item jid='jabber.i-pobox.net' name='Server in Germany'>
- <active port='5222'/>
+ <item jid="jabber.killerbees.org.uk" name="">
+ <active port="5222"/>
</item>
- <item jid='jabber.killerbees.org.uk' name=''>
- <active port='5222'/>
+ <item jid="jabber.linux.it" name="Jabber server in Italy">
+ <active port="5222"/>
</item>
- <item jid='jabber.linux.it' name='Jabber server in Italy'>
- <active port='5222'/>
+ <item jid="jabber.meta.net.nz" name="Jabber server in New Zealand">
+ <active port="5222"/>
</item>
- <item jid='jabber.meta.net.nz' name='Jabber server in New Zealand'>
- <active port='5222'/>
+ <item jid="jabber.minus273.org" name="">
+ <active port="5222"/>
</item>
- <item jid='jabber.minus273.org' name=''>
- <active port='5222'/>
+ <item jid="jabber.mulasystems.com" name="">
+ <active port="5222"/>
</item>
- <item jid='jabber.mulasystems.com' name=''>
- <active port='5222'/>
+ <item jid="jabber.ngnet.it" name="Server in Italy">
+ <active port="5222"/>
</item>
- <item jid='jabber.ngnet.it' name='Server in Italy'>
- <active port='5222'/>
+ <item jid="jabber.no" name="">
+ <active port="5222"/>
</item>
- <item jid='jabber.no' name=''>
- <active port='5222'/>
+ <item jid="jabber.noxa.de" name="Server in Germany">
+ <active port="5222"/>
</item>
- <item jid='jabber.noxa.de' name='Server in Germany'>
- <active port='5222'/>
+ <item jid="jabber.obsidian.co.za" name="Server in South Africa">
+ <active port="5222"/>
</item>
- <item jid='jabber.obsidian.co.za' name='Server in South Africa'>
- <active port='5222'/>
+ <item jid="jabber.od.ua" name="">
+ <active port="5222"/>
</item>
- <item jid='jabber.od.ua' name=''>
- <active port='5222'/>
+ <item jid="jabber.or.id" name="Indonesian Jabber server">
+ <active port="5222"/>
</item>
- <item jid='jabber.or.id' name='Indonesian Jabber server'>
- <active port='5222'/>
+ <item jid="jabber.org" name="Server hosted by the Jabber Software Foundation">
+ <active port="5222"/>
</item>
- <item jid='jabber.org' name='Server hosted by the Jabber Software Foundation'>
- <active port='5222'/>
+ <item jid="jabber.org.au" name="Server in Australia">
+ <active port="5222"/>
</item>
- <item jid='jabber.org.au' name='Server in Australia'>
- <active port='5222'/>
+ <item jid="jabber.org.nz" name="">
+ <active port="5222"/>
</item>
- <item jid='jabber.org.nz' name=''>
- <active port='5222'/>
+ <item jid="jabber.palomine.net" name="Server located in Delray Beach, Florida">
+ <active port="5222"/>
</item>
- <item jid='jabber.palomine.net' name='Server located in Delray Beach, Florida'>
- <active port='5222'/>
+ <item jid="jabber.papla.pl" name="">
+ <active port="5222"/>
</item>
- <item jid='jabber.papla.pl' name=''>
- <active port='5222'/>
+ <item jid="jabber.pilgerer.de" name="">
+ <active port="5222"/>
</item>
- <item jid='jabber.pilgerer.de' name=''>
- <active port='5222'/>
+ <item jid="jabber.ru" name="Russian Jabber server">
+ <active port="5222"/>
</item>
- <item jid='jabber.ru' name='Russian Jabber server'>
- <active port='5222'/>
+ <item jid="jabber.sim.pl" name="">
+ <active port="5222"/>
</item>
- <item jid='jabber.sim.pl' name=''>
- <active port='5222'/>
+ <item jid="jabber.sk" name="Slovak Jabber server">
+ <active port="5222"/>
</item>
- <item jid='jabber.sk' name='Slovak Jabber server'>
- <active port='5222'/>
+ <item jid="jabber.snc.ru" name="Jabber server in Russia">
+ <active port="5222"/>
</item>
- <item jid='jabber.snc.ru' name='Jabber server in Russia'>
- <active port='5222'/>
+ <item jid="jabber.te.ua" name="Server in Ukraine">
+ <active port="5222"/>
</item>
- <item jid='jabber.te.ua' name='Server in Ukraine'>
- <active port='5222'/>
+ <item jid="jabber.ttn.ru" name="">
+ <active port="5222"/>
</item>
- <item jid='jabber.ttn.ru' name=''>
- <active port='5222'/>
+ <item jid="jabber.turk-php.com" name="">
+ <active port="5222"/>
</item>
- <item jid='jabber.turk-php.com' name=''>
- <active port='5222'/>
+ <item jid="jabber.typhon.net" name="">
+ <active port="5222"/>
</item>
- <item jid='jabber.typhon.net' name=''>
- <active port='5222'/>
+ <item jid="jabber.unesco.kz" name="First public server in Kazakhstan">
+ <active port="5222"/>
</item>
- <item jid='jabber.unesco.kz' name='First public server in Kazakhstan'>
- <active port='5222'/>
+ <item jid="jabber.unixfreunde.net" name="">
+ <active port="5222"/>
</item>
- <item jid='jabber.unixfreunde.net' name=''>
- <active port='5222'/>
+ <item jid="jabber.unoc.net" name="">
+ <active port="5222"/>
</item>
- <item jid='jabber.unoc.net' name=''>
- <active port='5222'/>
+ <item jid="jabber.wiretrip.org" name="Jabber server from wiretrip.org">
+ <active port="5222"/>
</item>
- <item jid='jabber.wiretrip.org' name='Jabber server from wiretrip.org'>
- <active port='5222'/>
+ <item jid="jabber.wp.pl" name="Large Jabber server in Poland">
+ <active port="5222"/>
</item>
- <item jid='jabber.wp.pl' name='Large Jabber server in Poland'>
- <active port='5222'/>
+ <item jid="jabber.wroc.pl" name="">
+ <active port="5222"/>
</item>
- <item jid='jabber.wroc.pl' name=''>
- <active port='5222'/>
+ <item jid="jabber.xs4all.nl" name="">
+ <active port="5222"/>
</item>
- <item jid='jabber.xs4all.nl' name=''>
- <active port='5222'/>
+ <item jid="jabber80.com" name="Jabber server over port 80 (SSL over port 443)">
+ <active port="80"/>
</item>
- <item jid='jabber80.com' name='Jabber server over port 80 (SSL over port 443)'>
- <active port='80'/>
+ <item jid="jabberafrica.org" name="Jabber server in Africa">
+ <active port="5222"/>
</item>
- <item jid='jabberafrica.org' name='Jabber server in Africa'>
- <active port='5222'/>
+ <item jid="jabberes.org" name="Servidor Jabber de la comunidad hispana">
+ <active port="5222"/>
</item>
- <item jid='jabberes.org' name='Servidor Jabber de la comunidad hispana'>
- <active port='5222'/>
+ <item jid="jabberme.de" name="">
+ <active port="5222"/>
</item>
- <item jid='jabberme.de' name=''>
- <active port='5222'/>
+ <item jid="jabbernet.dk" name="Jabber server in Denmark">
+ <active port="5222"/>
</item>
- <item jid='jabbernet.dk' name='Jabber server in Denmark'>
- <active port='5222'/>
+ <item jid="jabbernuke.com" name="">
+ <active port="5222"/>
</item>
- <item jid='jabbernuke.com' name=''>
- <active port='5222'/>
+ <item jid="jabberpl.org" name="Jabber server in Poland">
+ <active port="5222"/>
</item>
- <item jid='jabberpl.org' name='Jabber server in Poland'>
- <active port='5222'/>
+ <item jid="jaim.at" name="">
+ <active port="5222"/>
</item>
- <item jid='jaim.at' name=''>
- <active port='5222'/>
+ <item jid="manya.urbanturban.no" name="">
+ <active port="5222"/>
</item>
- <item jid='manya.urbanturban.no' name=''>
- <active port='5222'/>
+ <item jid="myjabber.net" name="The public Jabber server hosted by MyJabber">
+ <active port="5222"/>
</item>
- <item jid='myjabber.net' name='The public Jabber server hosted by MyJabber'>
- <active port='5222'/>
+ <item jid="nedbsd.nl" name="Jabber server in the Netherlands">
+ <active port="5222"/>
</item>
- <item jid='nedbsd.nl' name='Jabber server in the Netherlands'>
- <active port='5222'/>
+ <item jid="nedlinux.nl" name="Jabber server in the Netherlands">
+ <active port="5222"/>
</item>
- <item jid='nedlinux.nl' name='Jabber server in the Netherlands'>
- <active port='5222'/>
+ <item jid="netmindz.net" name="">
+ <active port="5222"/>
</item>
- <item jid='netmindz.net' name=''>
- <active port='5222'/>
+ <item jid="njs.netlab.cz" name="Czech Jabber server">
+ <active port="5222"/>
</item>
- <item jid='njs.netlab.cz' name='Czech Jabber server'>
- <active port='5222'/>
+ <item jid="nureality.ca" name="Public server provided by Nureality Networks">
+ <active port="5222"/>
</item>
- <item jid='nureality.ca' name='Public server provided by Nureality Networks'>
- <active port='5222'/>
+ <item jid="oborona.net" name="">
+ <active port="5222"/>
</item>
- <item jid='oborona.net' name=''>
- <active port='5222'/>
+ <item jid="om.beeonline.ru" name="">
+ <active port="5222"/>
</item>
- <item jid='om.beeonline.ru' name=''>
- <active port='5222'/>
+ <item jid="pan.ubishops.ca" name="Server run by the computer science club at Bishops University in Quebec.">
+ <active port="5222"/>
</item>
- <item jid='pan.ubishops.ca' name='Server run by the computer science club at Bishops University in Quebec.'>
- <active port='5222'/>
+ <item jid="pandion.be" name="">
+ <active port="5222"/>
</item>
- <item jid='pandion.be' name=''>
- <active port='5222'/>
+ <item jid="penwritten.com" name="">
+ <active port="5222"/>
</item>
- <item jid='penwritten.com' name=''>
- <active port='5222'/>
+ <item jid="piramida.slask.pl" name="">
+ <active port="5222"/>
</item>
- <item jid='piramida.slask.pl' name=''>
- <active port='5222'/>
+ <item jid="pointblue.com.pl" name="">
+ <active port="5223"/>
</item>
- <item jid='pointblue.com.pl' name=''>
- <active port='5223'/>
+ <item jid="pono.mauiholm.org" name="">
+ <active port="5222"/>
</item>
- <item jid='pono.mauiholm.org' name=''>
- <active port='5222'/>
+ <item jid="selfnet.at" name="">
+ <active port="5222"/>
</item>
- <item jid='selfnet.at' name=''>
- <active port='5222'/>
+ <item jid="sistemas.unsa.edu.ar" name="Jabber server in Argentina">
+ <active port="5222"/>
</item>
- <item jid='sistemas.unsa.edu.ar' name='Jabber server in Argentina'>
- <active port='5222'/>
+ <item jid="sourcecode.de" name="Server in Germany">
+ <active port="5222"/>
</item>
- <item jid='sourcecode.de' name='Server in Germany'>
- <active port='5222'/>
+ <item jid="sparetimegroup.net" name="Server in Romania">
+ <active port="5222"/>
</item>
- <item jid='sparetimegroup.net' name='Server in Romania'>
- <active port='5222'/>
+ <item jid="swissjabber.ch" name="Swiss Jabber server">
+ <active port="5222"/>
</item>
- <item jid='swissjabber.ch' name='Swiss Jabber server'>
- <active port='5222'/>
+ <item jid="swissjabber.de" name="Jabber server in Switzerland">
+ <active port="5222"/>
</item>
- <item jid='swissjabber.de' name='Jabber server in Switzerland'>
- <active port='5222'/>
+ <item jid="swissjabber.li" name="Jabber server in Liechtenstein">
+ <active port="5222"/>
</item>
- <item jid='swissjabber.li' name='Jabber server in Liechtenstein'>
- <active port='5222'/>
+ <item jid="swissjabber.org" name="Jabber server in Switzerland">
+ <active port="5222"/>
</item>
- <item jid='swissjabber.org' name='Jabber server in Switzerland'>
- <active port='5222'/>
+ <item jid="syndicon.de" name="Server in Germany">
+ <active port="5222"/>
</item>
- <item jid='syndicon.de' name='Server in Germany'>
- <active port='5222'/>
+ <item jid="tipic.com" name="Public server hosted by Tipic">
+ <active port="5222"/>
</item>
- <item jid='tipic.com' name='Public server hosted by Tipic'>
- <active port='5222'/>
+ <item jid="transactim.net" name="Server hosted by TransactIM">
+ <active port="5222"/>
</item>
- <item jid='transactim.net' name='Server hosted by TransactIM'>
- <active port='5222'/>
+ <item jid="unstable.nl" name="Server in the Netherlands">
+ <active port="5222"/>
</item>
- <item jid='unstable.nl' name='Server in the Netherlands'>
- <active port='5222'/>
+ <item jid="ursine.ca" name="">
+ <active port="5222"/>
</item>
- <item jid='ursine.ca' name=''>
- <active port='5222'/>
+ <item jid="volgograd.ru" name="">
+ <active port="5222"/>
</item>
- <item jid='volgograd.ru' name=''>
- <active port='5222'/>
+ <item jid="xmpp.ru" name="">
+ <active port="5222"/>
</item>
- <item jid='xmpp.ru' name=''>
- <active port='5222'/>
+ <item jid="xmpp.us" name="">
+ <active port="5222"/>
</item>
- <item jid='xmpp.us' name=''>
- <active port='5222'/>
- </item>
-</query>
-
+</query>
\ No newline at end of file