all: include a <name> in <country>lr/country-name

This makes the database slightly more usable for installations without
iso-codes, should any exist.

But, perhaps more importantly, it allows us to do something at least
somewhat sensible if we can't look the country up in the iso-codes
database.

That is, of course, the case for Kosovo, for which we were forced to use
a provisional code (xk) because it still wasn't assigned any by ISO.
See commit 19846074c75b ('xk: add Ipko service provider').

Relevant libnma change:
https://gitlab.gnome.org/GNOME/libnma/-/merge_requests/50

2 files changed, 155 insertions, 155 deletions

diff --git a/serviceproviders.2.dtd b/serviceproviders.2.dtd
index 3048c58..f2d5bd3 100644
--- a/serviceproviders.2.dtd
+++ b/serviceproviders.2.dtd
@@ -1,7 +1,7 @@
 <!ELEMENT serviceproviders (country*)>
 <!ATTLIST serviceproviders format CDATA #REQUIRED>
 
-<!ELEMENT country (provider*)>
+<!ELEMENT country (name+, provider*)>
 <!ATTLIST country code CDATA #REQUIRED>
 
 <!ELEMENT provider (name+, gsm?, cdma?)>
diff --git a/serviceproviders.xml b/serviceproviders.xml
index 14f7cdb..891fcce 100644
--- a/serviceproviders.xml
+++ b/serviceproviders.xml
@@ -39,8 +39,8 @@ conceived.
 
 <serviceproviders format="2.0">
 
-<!-- Andorra -->
 <country code="ad">
+	<name>Andorra</name>
 	<provider>
 		<name>Andorra Telecom (Mobiland)</name>
 		<gsm>
@@ -66,8 +66,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- United Arab Emirates -->
 <country code="ae">
+	<name>United Arab Emirates</name>
 	<provider>
 		<name>Etisalat</name>
 		<gsm>
@@ -123,8 +123,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Afghanistan -->
 <country code="af">
+	<name>Afghanistan</name>
 	<provider>
 		<name>AWCC</name>
 		<gsm>
@@ -146,8 +146,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Albania -->
 <country code="al">
+	<name>Albania</name>
 	<provider>
 		<name>Vodafone</name>
 		<gsm>
@@ -192,8 +192,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Armenia -->
 <country code="am">
+	<name>Armenia</name>
 	<provider>
 		<name>Beeline</name>
 		<gsm>
@@ -332,8 +332,8 @@ conceived.
 </country>
 
 
-<!-- Angola -->
 <country code="ao">
+	<name>Angola</name>
 	<provider>
 		<name>Movinet</name>
 		<cdma>
@@ -357,8 +357,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Argentina -->
 <country code="ar">
+	<name>Argentina</name>
 	<provider>
 		<name>Personal</name>
 		<gsm>
@@ -463,8 +463,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Austria -->
 <country code="at">
+	<name>Austria</name>
 	<provider>
 		<name>A1/Telekom Austria</name>
 		<gsm>
@@ -747,10 +747,10 @@ conceived.
 	</provider>
 </country>
 
-<!-- Australia -->
 <!-- http://whirlpool.net.au/wiki/mobiles_apn
      http://ausdroid.net/apns/ -->
 <country code="au">
+	<name>Australia</name>
 	<provider>
 		<name>Aldi Mobile AU</name>
 		<!-- https://www.aldimobile.com.au/blogs/using-and-managing-your-service/what-are-the-data-internet-settings-for-my-aldimobile-service -->
@@ -1185,8 +1185,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Azerbaijan -->
 <country code="az">
+	<name>Azerbaijan</name>
 	<provider>
 		<name>Azercell</name>
 		<gsm>
@@ -1228,8 +1228,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Bosnia & Herzegovina -->
 <country code="ba">
+	<name>Bosnia and Herzegovina</name>
 	<provider>
 		<name>BH GSM</name>
 		<gsm>
@@ -1317,8 +1317,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Barbados -->
 <country code="bb">
+	<name>Barbados</name>
 	<provider>
 		<name>Digicel</name>
 		<gsm>
@@ -1331,8 +1331,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Bangladesh -->
 <country code="bd">
+	<name>Bangladesh</name>
 	<provider>
 		<name>Robi (AKTel)</name>
 		<gsm>
@@ -1496,8 +1496,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Belgium -->
 <country code="be">
+	<name>Belgium</name>
 	<provider>
 		<name>Lycamobile</name>
 		<gsm>
@@ -1667,8 +1667,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Burkina Faso -->
 <country code="bf">
+	<name>Burkina Faso</name>
 	<provider>
 		<name>Airtel 3G</name>
 		<gsm>
@@ -1681,8 +1681,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Bulgaria -->
 <country code="bg">
+	<name>Bulgaria</name>
 	<provider>
 		<name>GloBul</name>
 		<gsm>
@@ -1767,8 +1767,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Bahrain -->
 <country code="bh">
+	<name>Bahrain</name>
 	<provider>
 		<name>Batelco</name>
 		<gsm>
@@ -1831,8 +1831,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Brazil -->
 <country code="br">
+	<name>Brazil</name>
 	<provider>
 		<!-- Brasil Telecom was bought by Oi on 2009-01-09 and will be phased
 		     out and transitioned to Oi.
@@ -2018,8 +2018,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Bahamas -->
 <country code="bs">
+	<name>Bahamas</name>
 	<provider>
 		<name>Aliv</name>
 		<gsm>
@@ -2041,8 +2041,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Bermuda -->
 <country code="bm">
+	<name>Bermuda</name>
 	<provider>
 		<name>CellOne</name>
 		<gsm>
@@ -2054,8 +2054,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Brunei -->
 <country code="bn">
+	<name>Brunei</name>
 	<provider>
 		<name>B-Mobile</name>
 		<gsm>
@@ -2094,8 +2094,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Belarus -->
 <country code="by">
+	<name>Belarus</name>
 	<provider>
 		<!-- http://www.velcom.by/ru/services/gprs/settings/ -->
 		<name>velcom</name>
@@ -2225,8 +2225,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Botswana -->
 <country code="bw">
+	<name>Botswana</name>
 	<provider>
 		<name>Mascom Wireless</name>
 		<gsm>
@@ -2255,8 +2255,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Burundi -->
 <country code="bi">
+	<name>Burundi</name>
 	<provider>
 		<name>Leo/UCom</name>
 		<gsm>
@@ -2285,8 +2285,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Canada -->
 <country code="ca">
+	<name>Canada</name>
 	<provider>
 		<name>Fido</name>
 		<gsm>
@@ -2532,8 +2532,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Congo (Dem. Rep.) -->
 <country code="cd">
+	<name>Congo (Dem. Rep.)</name>
 	<provider>
 		<name>Vodacom</name>
 		<gsm>
@@ -2554,12 +2554,12 @@ conceived.
 	</provider>
 </country>
 
-<!-- Congo (Rep.) -->
 <country code="cg">
+	<name>Congo (Rep.)</name>
 </country>
 
-<!-- Switzerland -->
 <country code="ch">
+	<name>Switzerland</name>
 	<provider>
 		<name>Lycamobile</name>
 		<gsm>
@@ -2691,8 +2691,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Cote d'Ivoire -->
 <country code="ci">
+	<name>Cote d'Ivoire</name>
 	<provider>
 		<name>MTN</name>
 		<gsm>
@@ -2721,8 +2721,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Chile -->
 <country code="cl">
+	<name>Chile</name>
 	<provider>
 		<name>Claro Chile</name>
 		<gsm>
@@ -2833,8 +2833,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Cameroon -->
 <country code="cm">
+	<name>Cameroon</name>
 	<provider>
 		<name>Orange</name>
 		<gsm>
@@ -2861,8 +2861,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- China -->
 <country code="cn">
+	<name>China</name>
 	<provider>
 		<name>China Mobile</name>
 		<gsm>
@@ -2944,8 +2944,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Costa Rica -->
 <country code="cr">
+	<name>Costa Rica</name>
 	<provider>
 		<name>IceCelular</name>
 		<gsm>
@@ -2983,8 +2983,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Colombia -->
 <country code="co">
+	<name>Colombia</name>
 	<provider>
 		<name>Claro</name>
 		<gsm>
@@ -3097,8 +3097,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Cyprus -->
 <country code="cy">
+	<name>Cyprus</name>
 	<provider>
 		<name>Cytamobile-Vodafone</name>
 		<gsm>
@@ -3138,8 +3138,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Czech Republic -->
 <country code="cz">
+	<name>Czech Republic</name>
 	<provider>
 		<name>Vodafone</name>
 		<gsm>
@@ -3232,8 +3232,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Germany -->
 <country code="de">
+	<name>Germany</name>
 	<provider>
 		<name>AldiTalk/MedionMobile</name>
 		<gsm>
@@ -3656,8 +3656,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Denmark -->
 <country code="dk">
+	<name>Denmark</name>
 	<provider primary="true">
 		<name>3</name>
 		<gsm>
@@ -3904,8 +3904,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Dominican Republic -->
 <country code="do">
+	<name>Dominican Republic</name>
 	<provider>
 		<name>Orange</name>
 		<gsm>
@@ -3955,8 +3955,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Algeria -->
 <country code="dz">
+	<name>Algeria</name>
 	<provider>
 		<name>Djezzy</name>
 		<gsm>
@@ -4017,8 +4017,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Ecuador -->
 <country code="ec">
+	<name>Ecuador</name>
 	<provider>
 		<name>Movistar UMTS</name>
 		<gsm>
@@ -4059,8 +4059,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Estonia -->
 <country code="ee">
+	<name>Estonia</name>
 	<provider>
 		<name>EMT</name>
 		<gsm>
@@ -4134,8 +4134,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Egypt -->
 <country code="eg">
+	<name>Egypt</name>
 	<provider>
 		<name>Vodafone</name>
 		<gsm>
@@ -4198,8 +4198,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Spain -->
 <country code="es">
+	<name>Spain</name>
 	<provider>
 		<name>Euskaltel</name>
 		<gsm>
@@ -4540,8 +4540,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Ethiopia -->
 <country code="et">
+	<name>Ethiopia</name>
 	<provider>
 		<name>Ethio Telecom</name>
 		<gsm>
@@ -4564,8 +4564,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Faroe Islands -->
 <country code="fo">
+	<name>Faroe Islands</name>
 	<provider>
 		<name>Vodafone FO</name>
 		<gsm>
@@ -4581,8 +4581,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Finland -->
 <country code="fi">
+	<name>Finland</name>
 	<provider>
 		<name>Kuiri</name>
 		<gsm>
@@ -4745,8 +4745,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Fiji -->
 <country code="fj">
+	<name>Fiji</name>
 	<provider>
 		<name>Vodafone / Kidanet</name>
 		<gsm>
@@ -4771,8 +4771,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- France -->
 <country code="fr">
+	<name>France</name>
 	<provider>
 		<name>A Mobile (Auchan Telecom)</name>
 		<gsm>
@@ -5134,8 +5134,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Britain -->
 <country code="gb">
+	<name>Britain</name>
 	<provider>
 		<name>BT Mobile</name>
 		<gsm>
@@ -5432,8 +5432,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Georgia -->
 <country code="ge">
+	<name>Georgia</name>
 	<provider>
 		<name>Geocell</name>
 		<gsm>
@@ -5454,8 +5454,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Guernsey -->
 <country code="gg">
+	<name>Guernsey</name>
 	<provider>
 		<name>Airtel-Vodaphone</name>
 		<gsm>
@@ -5509,8 +5509,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Ghana -->
 <country code="gh">
+	<name>Ghana</name>
 	<provider>
 		<name>MTN</name>
 		<gsm>
@@ -5610,8 +5610,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Greenland -->
 <country code="gl">
+	<name>Greenland</name>
 	<!-- http://www.tele.gl/da-DK/Privat/Info/Selvbetjening/Mobilopsaetning/Sider/ManuelOpsaetning.aspx -->
 	<provider>
 		<name>Tele Greenland A/S</name>
@@ -5623,8 +5623,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Greece -->
 <country code="gr">
+	<name>Greece</name>
 	<provider>
 		<name>Cosmote</name>
 		<gsm>
@@ -5697,8 +5697,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Guatemala -->
 <country code="gt">
+	<name>Guatemala</name>
 	<provider>
 		<name>Claro</name>
 		<gsm>
@@ -5741,8 +5741,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Guinea -->
 <country code="gn">
+	<name>Guinea</name>
 	<provider>
 		<name>Orange</name>
 		<gsm>
@@ -5767,8 +5767,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Guyana -->
 <country code="gy">
+	<name>Guyana</name>
 	<provider>
 		<name>GT&amp;T Cellink Plus</name>
 		<gsm>
@@ -5803,8 +5803,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Hong Kong -->
 <country code="hk">
+	<name>Hong Kong</name>
 	<provider>
 		<name>CSL</name>
 		<gsm>
@@ -5957,8 +5957,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Honduras -->
 <country code="hn">
+	<name>Honduras</name>
 	<provider>
 		<name>Tigo</name>
 		<gsm>
@@ -5971,8 +5971,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Croatia -->
 <country code="hr">
+	<name>Croatia</name>
 	<provider>
 		<name>T-Mobile</name>
 		<gsm>
@@ -6069,8 +6069,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Hungary -->
 <country code="hu">
+	<name>Hungary</name>
 	<provider>
 		<name>Telenor</name>
 		<gsm>
@@ -6172,8 +6172,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Indonesia -->
 <country code="id">
+	<name>Indonesia</name>
 	<provider>
 		<name>3</name>
 		<gsm>
@@ -6366,8 +6366,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Ireland -->
 <country code="ie">
+	<name>Ireland</name>
 	<provider>
 		<name>Lycamobile</name>
 		<gsm>
@@ -6525,8 +6525,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Israel -->
 <country code="il">
+	<name>Israel</name>
 	<provider>
 		<name>CellCom</name>
 		<gsm>
@@ -6677,8 +6677,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Isle of Man -->
 <country code="im">
+	<name>Isle of Man</name>
 	<provider>
 		<name>Manx Telecom</name>
 		<gsm>
@@ -6716,8 +6716,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- India -->
 <country code="in">
+	<name>India</name>
 	<provider>
 		<name>AIRCEL</name>
 		<gsm>
@@ -7177,8 +7177,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Iraq -->
 <country code="iq">
+	<name>Iraq</name>
 	<provider>
 		<name>Itisaluna</name>
 		<cdma>
@@ -7230,8 +7230,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Iran -->
 <country code="ir">
+	<name>Iran</name>
 	<provider>
 		<name>همراه اول</name>
 		<gsm>
@@ -7254,8 +7254,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Iceland -->
 <country code="is">
+	<name>Iceland</name>
 	<provider>
 		<name>Vodafone</name>
 		<gsm>
@@ -7307,8 +7307,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Italy -->
 <country code="it">
+	<name>Italy</name>
 	<provider>
 		<name>Vodafone</name>
 		<gsm>
@@ -7548,8 +7548,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Jersey -->
 <country code="je">
+	<name>Jersey</name>
 	<provider>
 		<name>Airtel-Vodaphone</name>
 		<gsm>
@@ -7592,8 +7592,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Jamaica -->
 <country code="jm">
+	<name>Jamaica</name>
 	<provider>
 		<name>Cable &amp; Wireless</name>
 		<gsm>
@@ -7620,8 +7620,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Hashemite Kingdom of Jordan -->
 <country code="jo">
+	<name>Hashemite Kingdom of Jordan</name>
 	<provider>
 		<name>Orange</name>
 		<gsm>
@@ -7656,8 +7656,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Japan -->
 <country code="jp">
+	<name>Japan</name>
 	<provider>
 		<name>Softbank Mobile</name>
 		<gsm>
@@ -7895,8 +7895,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Kenya -->
 <country code="ke">
+	<name>Kenya</name>
 	<provider>
 		<name>Airtel</name>
 		<gsm>
@@ -7971,8 +7971,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Kyrgyzstan -->
 <country code="kg">
+	<name>Kyrgyzstan</name>
 	<provider>
 		<name>Beeline</name>
 		<gsm>
@@ -8014,8 +8014,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Cambodia -->
 <country code="kh">
+	<name>Cambodia</name>
 	<provider>
 		<name>Cellcard</name>
 		<gsm>
@@ -8153,8 +8153,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Korea, Republic of -->
 <country code="kr">
+	<name>Korea, Republic of</name>
 	<provider>
 		<name>KT</name>
 		<gsm>
@@ -8223,8 +8223,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Kuwait -->
 <country code="kw">
+	<name>Kuwait</name>
 	<provider>
 		<name>Zain</name>
 		<gsm>
@@ -8277,8 +8277,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Kazakhstan -->
 <country code="kz">
+	<name>Kazakhstan</name>
 	<provider>
 		<name>Beeline</name>
 		<gsm>
@@ -8341,8 +8341,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Laos -->
 <country code="la">
+	<name>Laos</name>
 	<provider>
 		<name>ETL</name>
 		<gsm>
@@ -8395,8 +8395,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Lebanon -->
 <country code="lb">
+	<name>Lebanon</name>
 	<provider>
 		<name>MTC Touch</name>
 		<gsm>
@@ -8416,8 +8416,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Liechtenstein -->
 <country code="li">
+	<name>Liechtenstein</name>
 	<provider>
 		<name>Datamobile</name>
 		<gsm>
@@ -8430,8 +8430,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- St Lucia -->
 <country code="lc">
+	<name>St Lucia</name>
 	<provider>
 		<name>Cable &amp; Wireless</name>
 		<gsm>
@@ -8450,8 +8450,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Sri Lanka -->
 <country code="lk">
+	<name>Sri Lanka</name>
 	<provider>
 		<name>Airtel</name>
 		<gsm>
@@ -8532,8 +8532,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Lesotho -->
 <country code="ls">
+	<name>Lesotho</name>
 	<provider>
 		<name>Vodacom Lesotho</name>
 		<gsm>
@@ -8546,8 +8546,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Lithuania -->
 <country code="lt">
+	<name>Lithuania</name>
 	<provider>
 		<name>Bite</name>
 		<gsm>
@@ -8626,8 +8626,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Luxembourg -->
 <country code="lu">
+	<name>Luxembourg</name>
 	<provider>
 		<name>LUXGSM</name>
 		<gsm>
@@ -8714,8 +8714,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Latvia -->
 <country code="lv">
+	<name>Latvia</name>
 	<provider>
 		<name>LMT</name>
 		<gsm>
@@ -8790,8 +8790,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Morocco -->
 <country code="ma">
+	<name>Morocco</name>
 	<provider>
 		<name>Ittissalat Al Maghrib (IAM)</name>
 		<gsm>
@@ -8861,8 +8861,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Moldova -->
 <country code="md">
+	<name>Moldova</name>
 	<provider>
 		<name>Moldcell</name>
 		<gsm>
@@ -8917,8 +8917,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Montenegro -->
 <country code="me">
+	<name>Montenegro</name>
 	<provider>
 		<name>ProMonte GSM</name>
 		<gsm>
@@ -8987,8 +8987,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Madagascar -->
 <country code="mg">
+	<name>Madagascar</name>
 	<provider>
 		<name>Airtel</name>
 		<gsm>
@@ -9023,8 +9023,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Mali -->
 <country code="ml">
+	<name>Mali</name>
 	<provider>
 		<name>Malitel</name>
 		<gsm>
@@ -9065,8 +9065,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Myanmar -->
 <country code="mm">
+	<name>Myanmar</name>
 	<provider>
 		<name>MPT</name>
 		<gsm>
@@ -9108,8 +9108,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Mongolia -->
 <country code="mn">
+	<name>Mongolia</name>
 	<provider>
 		<name>MobiCom</name>
 		<gsm>
@@ -9128,8 +9128,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Macau -->
 <country code="mo">
+	<name>Macau</name>
 	<provider>
 		<name>3 / Hutchison</name>
 		<gsm>
@@ -9174,8 +9174,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Macedonia -->
 <country code="mk">
+	<name>Macedonia</name>
 	<provider>
 		<name>T-Mobile</name>
 		<gsm>
@@ -9237,8 +9237,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Malta -->
 <country code="mt">
+	<name>Malta</name>
 	<provider>
 		<name>GO Mobile</name>
 		<gsm>
@@ -9291,8 +9291,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Mauritius -->
 <country code="mu">
+	<name>Mauritius</name>
 	<provider>
 		<name>Emtel</name>
 		<gsm>
@@ -9305,8 +9305,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Maldives -->
 <country code="mv">
+	<name>Maldives</name>
 	<provider>
 		<name>Dhiraagu</name>
 		<gsm>
@@ -9335,8 +9335,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Malawi -->
 <country code="mw">
+	<name>Malawi</name>
 	<provider>
 		<name>Airtel MW</name>
 		<gsm>
@@ -9367,8 +9367,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Mexico -->
 <country code="mx">
+	<name>Mexico</name>
 	<provider>
 		<name>Telcel</name>
 		<gsm>
@@ -9419,8 +9419,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Malaysia -->
 <country code="my">
+	<name>Malaysia</name>
 	<provider>
 		<name>DiGi</name>
 		<gsm>
@@ -9510,8 +9510,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Mozambique -->
 <country code="mz">
+	<name>Mozambique</name>
 	<provider>
 		<name>MCel</name>
 		<gsm>
@@ -9555,8 +9555,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Namibia -->
 <country code="na">
+	<name>Namibia</name>
 	<provider>
 		<name>MTC</name>
 		<gsm>
@@ -9603,8 +9603,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Nigeria -->
 <country code="ng">
+	<name>Nigeria</name>
 	<provider>
 		<name>Airtel NG</name>
 		<!-- http://www.airtel.com/wps/wcm/connect/africaairtel/nigeria/3g/home/3gpower/PG_Internet_Settings -->
@@ -9710,8 +9710,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Nicaragua -->
 <country code="ni">
+	<name>Nicaragua</name>
 	<provider>
 		<name>Claro</name>
 		<gsm>
@@ -9761,8 +9761,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Netherlands -->
 <country code="nl">
+	<name>Netherlands</name>
 	<provider>
 		<name>Hi</name>
 		<gsm>
@@ -10022,8 +10022,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Norway -->
 <country code="no">
+	<name>Norway</name>
 	<provider>
 		<name>Netcom</name>
 		<gsm>
@@ -10250,8 +10250,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Nepal -->
 <country code="np">
+	<name>Nepal</name>
 	<provider>
 		<name>Nepal Telecom</name>
 		<gsm>
@@ -10274,8 +10274,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- New Zealand -->
 <country code="nz">
+	<name>New Zealand</name>
 	<provider>
 		<name>Telecom New Zealand</name>
 		<gsm>
@@ -10384,8 +10384,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Oman -->
 <country code="om">
+	<name>Oman</name>
 	<provider>
 		<name>Oman Mobile</name>
 		<gsm>
@@ -10431,8 +10431,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Panama -->
 <country code="pa">
+	<name>Panama</name>
 	<provider>
 		<name>Cable and Wireless</name>
 		<gsm>
@@ -10465,8 +10465,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Peru -->
 <country code="pe">
+	<name>Peru</name>
 	<provider>
 		<name>Claro</name>
 		<gsm>
@@ -10516,8 +10516,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- French Polynesia -->
 <country code="pf">
+	<name>French Polynesia</name>
 	<provider>
 		<name>Vini</name>
 		<gsm>
@@ -10530,8 +10530,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Papua New Guinea -->
 <country code="pg">
+	<name>Papua New Guinea</name>
 	<provider>
 		<name>Digicel</name>
 		<gsm>
@@ -10547,8 +10547,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Philippines -->
 <country code="ph">
+	<name>Philippines</name>
 	<provider>
 		<name>Globe Telecom</name>
 		<gsm>
@@ -10626,8 +10626,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Pakistan -->
 <country code="pk">
+	<name>Pakistan</name>
 	<provider>
 		<name>Djuice</name>
 		<gsm>
@@ -10727,8 +10727,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Poland -->
 <country code="pl">
+	<name>Poland</name>
 	<!-- Polish physical operators -->
 	<provider primary="true">
 		<name>T-Mobile</name>
@@ -11110,8 +11110,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Portugal -->
 <country code="pt">
+	<name>Portugal</name>
 	<provider>
 		<name>Kanguru</name>
 		<gsm>
@@ -11283,8 +11283,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Paraguay -->
 <country code="py">
+	<name>Paraguay</name>
 	<provider>
 		<name>VOX</name>
 		<gsm>
@@ -11341,8 +11341,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Qatar -->
 <country code="qa">
+	<name>Qatar</name>
 	<provider>
 		<name>Vodafone</name>
 		<gsm>
@@ -11385,8 +11385,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Réunion (France) -->
 <country code="re">
+	<name>Réunion (France)</name>
 	<provider>
 		<name>SFR Réunion</name>
 		<gsm>
@@ -11426,8 +11426,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Romania -->
 <country code="ro">
+	<name>Romania</name>
 	<provider>
 		<name>Orange</name>
 		<gsm>
@@ -11532,8 +11532,8 @@ conceived.
 
 </country>
 
-<!-- Serbia -->
 <country code="rs">
+	<name>Serbia</name>
 	<provider>
 		<name>Telenor</name>
 		<gsm>
@@ -11595,8 +11595,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Rwanda -->
 <country code="rw">
+	<name>Rwanda</name>
 	<provider>
 		<name>MTN</name>
 		<gsm>
@@ -11619,8 +11619,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Russia -->
 <country code="ru">
+	<name>Russia</name>
 	<provider>
 		<name>BaikalWestCom</name>
 		<name xml:lang="ru">БайкалВестКом</name>
@@ -11954,8 +11954,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Saudi Arabia -->
 <country code="sa">
+	<name>Saudi Arabia</name>
 	<provider>
 		<name>Mobily</name>
 		<gsm>
@@ -12015,8 +12015,8 @@ conceived.
 </country>
 
 
-<!-- Sweden -->
 <country code="se">
+	<name>Sweden</name>
 	<provider primary="true">
 		<name>3</name>
 		<gsm>
@@ -12266,8 +12266,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Singapore -->
 <country code="sg">
+	<name>Singapore</name>
 	<provider>
 		<name>M1</name>
 		<gsm>
@@ -12373,8 +12373,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Slovenia -->
 <country code="si">
+	<name>Slovenia</name>
 	<provider>
 		<name>Mobitel</name>
 		<gsm>
@@ -12459,8 +12459,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Slovakia -->
 <country code="sk">
+	<name>Slovakia</name>
 	<provider>
 		<name>Slovak Telekom</name>
 		<gsm>
@@ -12515,8 +12515,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Senegal -->
 <country code="sn">
+	<name>Senegal</name>
 	<provider>
 		<name>Tigo</name>
 		<gsm>
@@ -12531,8 +12531,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- El Salvador -->
 <country code="sv">
+	<name>El Salvador</name>
 	<provider>
 		<name>Movistar</name>
 		<gsm>
@@ -12584,8 +12584,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Sudan -->
 <country code="sd">
+	<name>Sudan</name>
 	<provider>
 		<name>Zain</name>
 		<gsm>
@@ -12632,8 +12632,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Thailand -->
 <country code="th">
+	<name>Thailand</name>
 	<provider>
 		<name>AIS</name>
 		<gsm>
@@ -12724,8 +12724,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Tunisia -->
 <country code="tn">
+	<name>Tunisia</name>
 	<provider>
 		<name>Orange</name>
 		<gsm>
@@ -12825,8 +12825,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Turkey -->
 <country code="tr">
+	<name>Turkey</name>
 	<provider>
 		<name>Avea</name>
 		<gsm>
@@ -12912,8 +12912,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Trinidad & Tobago -->
 <country code="tt">
+	<name>Trinidad and Tobago</name>
 	<provider>
 		<name>Digicel</name>
 		<gsm>
@@ -12954,8 +12954,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Taiwan -->
 <country code="tw">
+	<name>Taiwan</name>
 	<provider>
 		<name>Chunghwa Telecom (emome)</name>
 		<name xml:lang="zh">中華電信 (emome)</name>
@@ -13055,8 +13055,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Tanzania, United Republic of -->
 <country code="tz">
+	<name>Tanzania</name>
 	<provider>
 		<name>Airtel Tanzania</name>
 		<gsm>
@@ -13116,8 +13116,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Ukraine -->
 <country code="ua">
+	<name>Ukraine</name>
 	<provider>
 		<name>kyivstar</name>
 		<gsm>
@@ -13301,8 +13301,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Uganda -->
 <country code="ug">
+	<name>Uganda</name>
 	<provider>
 		<name>MTN</name>
 		<gsm>
@@ -13375,8 +13375,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- United States -->
 <country code="us">
+	<name>United States</name>
 	<provider>
 		<name>AT&amp;T</name>
 		<gsm>
@@ -14358,8 +14358,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Uruguay -->
 <country code="uy">
+	<name>Uruguay</name>
 	<provider>
 		<name>Ancel</name>
 		<gsm>
@@ -14436,8 +14436,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Uzbekistan -->
 <country code="uz">
+	<name>Uzbekistan</name>
 	<provider>
 		<name>Beeline</name>
 		<gsm>
@@ -14474,8 +14474,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- St Vincent -->
 <country code="vc">
+	<name>St Vincent</name>
 	<provider>
 		<name>Digicel</name>
 		<gsm>
@@ -14490,8 +14490,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Venezuela -->
 <country code="ve">
+	<name>Venezuela</name>
 	<provider>
 		<name>Digitel TIM</name>
 		<gsm>
@@ -14543,8 +14543,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Viet Nam -->
 <country code="vn">
+	<name>Viet Nam</name>
 	<provider>
 		<name>MobiFone</name>
 		<gsm>
@@ -14669,8 +14669,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- South Africa -->
 <country code="za">
+	<name>South Africa</name>
 	<provider>
 		<name>Cell-c</name>
 		<gsm>
@@ -14806,8 +14806,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Eswatini (Swaziland) -->
 <country code="sz">
+	<name>Eswatini</name>
 	<provider>
 		<name>MTN Eswatini</name>
 		<gsm>
@@ -14848,8 +14848,8 @@ conceived.
 	</provider>
 </country>
 
-<!-- Kosovo -->
 <country code="xk">
+	<name>Kosovo</name>
 	<provider>
 		<name>IPKO</name>
 		<gsm>