[sample] change apns-full-conf.xml & adjust indent.

1. Updated Country
   Portugal(PT), Netherlands(NL), Belgium(BE),
   Hungary(HU), Norway(NO), Denmark(DK)

2. Updated Operator (includes mvno operators)
   Tele2, KPN, Rabo Mobiel, Telenet, Mobistar, Djuice, VDF, TMO,
   TDC, Telmore, BiBoB, CBB, Telia, Call me, DLG Tele, Halebop,
   Telenor, Tele2, Netcom, Chess, DNA, Saunalahti, PortalOptimus,
   ZON, tmn, MTel, Vivacom, GLOBUL, Viaero, etc...

3. adjust indent and white space.
   Orange

Change-Id: I01e8e56684f5b0d40b1bd75cfcadc9f5f1f63775
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index cbff464..48e15a1 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -84,19 +84,40 @@
       type="mms"
   />
 
+  <apn carrier="Tele2 GPRS"
+      mcc="204"
+      mnc="02"
+      apn="internet.tele2.nl"
+      mmsc="http://mmsc.tele2.nl"
+      mmsproxy="193.12.40.64"
+      mmsport="8080"
+      type="default,supl,mms"
+  />
+
   <apn carrier="Vodafone NL"
       mcc="204"
       mnc="04"
       apn="live.vodafone.com"
       user="vodafone"
       password="vodafone"
+      authtype="1"
       mmsc="http://mmsc.mms.vodafone.nl"
       mmsproxy="192.168.251.150"
       mmsport="8799"
       type="default,supl,mms"
   />
 
-  <apn carrier="KPN Internet"
+  <apn carrier="KPN/Hi 4G LTE Mobiel internet"
+      mcc="204"
+      mnc="08"
+      apn="KPN4G.nl"
+      mmsc="http://mp.mobiel.kpn/mmsc"
+      mmsproxy="10.10.100.20"
+      mmsport="5080"
+      type="default,supl,mms"
+  />
+
+  <apn carrier="KPN/Hi Mobiel Internet"
       mcc="204"
       mnc="08"
       apn="portalmmm.nl"
@@ -106,6 +127,27 @@
       type="default,supl,mms"
   />
 
+  <apn carrier="Rabo Mobiel Int."
+      mcc="204"
+      mnc="08"
+      apn="rabo"
+      type="default,supl"
+      mvno_match_data="Rabo Mobiel"
+      mvno_type="spn"
+  />
+
+  <apn carrier="Rabo Mobiel MMS"
+      mcc="204"
+      mnc="08"
+      apn="rabo"
+      mmsc="http://mp.mobiel.kpn/mmsc"
+      mmsproxy="10.10.100.10"
+      mmsport="5080"
+      type="mms"
+      mvno_match_data="Rabo Mobiel"
+      mvno_type="spn"
+  />
+
   <apn carrier="Telfort Internet"
       mcc="204"
       mnc="12"
@@ -120,6 +162,7 @@
       mcc="204"
       mnc="16"
       apn="internet"
+      authtype="1"
       type="default,supl"
   />
 
@@ -129,6 +172,7 @@
       apn="mms"
       user="tmobilemms"
       password="tmobilemms"
+      authtype="1"
       mmsc="http://t-mobilemms"
       mmsproxy="10.10.10.11"
       mmsport="8080"
@@ -157,6 +201,7 @@
       mcc="204"
       mnc="16"
       apn="mms.ben"
+      authtype="1"
       mmsc="http://benmms/"
       mmsproxy="10.10.10.11"
       mmsport="8080"
@@ -165,14 +210,28 @@
       mvno_type="spn"
   />
 
-  <apn carrier="Rabo Mobiel"
+  <apn carrier="T-Mobile Internet"
       mcc="204"
       mnc="20"
-      apn="rabo.plus"
+      apn="internet"
+      authtype="1"
       type="default,supl"
   />
 
-  <apn carrier="Proximus MMS"
+  <apn carrier="T-Mobile MMS"
+      mcc="204"
+      mnc="20"
+      apn="mms"
+      user="tmobilemms"
+      password="tmobilemms"
+      authtype="1"
+      mmsc="http://t-mobilemms"
+      mmsproxy="10.10.10.11"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="Px MMS"
       mcc="206"
       mnc="01"
       apn="EVENT.PROXIMUS.BE"
@@ -185,7 +244,7 @@
       type="mms"
   />
 
-  <apn carrier="Proximus Internet"
+  <apn carrier="Px Internet"
       mcc="206"
       mnc="01"
       apn="INTERNET.PROXIMUS.BE"
@@ -193,24 +252,24 @@
   />
 
   <apn carrier="Telenet Internet"
-       mcc="206"
-       mnc="01"
-       apn="telenetwap.be"
-       type="default,supl"
-       mvno_match_data="2060188"
-       mvno_type="imsi"
+      mcc="206"
+      mnc="01"
+      apn="telenetwap.be"
+      type="default,supl"
+      mvno_match_data="2060188"
+      mvno_type="imsi"
   />
 
   <apn carrier="Telenet MMS"
-       mcc="206"
-       mnc="01"
-       apn="mms.be"
-       mmsc="http://mmsc.telenet.be"
-       mmsproxy="195.130.149.100"
-       mmsport="80"
-       type="mms"
-       mvno_match_data="2060188"
-       mvno_type="imsi"
+      mcc="206"
+      mnc="01"
+      apn="mms.be"
+      mmsc="http://mmsc.telenet.be"
+      mmsproxy="195.130.149.100"
+      mmsport="80"
+      type="mms"
+      mvno_match_data="2060188"
+      mvno_type="imsi"
   />
 
   <apn carrier="Virgin mobile"
@@ -236,7 +295,7 @@
       mvno_type="gid"
   />
 
-  <apn carrier="Telenet"
+  <apn carrier="Telenet Internet"
       mcc="206"
       mnc="05"
       apn="telenetwap.be"
@@ -263,23 +322,20 @@
       type="mms"
   />
 
-  <apn carrier="Mobistar"
+  <apn carrier="Mobistar Internet"
       mcc="206"
       mnc="10"
       apn="mworld.be"
-      user="mobistar"
-      password="mobistar"
-      proxy="212.65.63.143"
-      port="8080"
       type="default,supl"
   />
 
-  <apn carrier="Base"
+  <apn carrier="BASE WAP"
       mcc="206"
       mnc="20"
       apn="gprs.base.be"
       user="base"
       password="base"
+      authtype="1"
       proxy="172.31.198.37"
       port="5080"
       type="default,supl"
@@ -291,6 +347,7 @@
       apn="mms.base.be"
       user="base"
       password="base"
+      authtype="1"
       mmsc="http://mmsc.base.be"
       mmsproxy="217.72.235.1"
       mmsport="8080"
@@ -1032,47 +1089,130 @@
       type="default,supl"
   />
 
-  <apn carrier="T-Mobile MMS"
+  <apn carrier="Djuice MMS"
+      mcc="216"
+      mnc="01"
+      apn="mms"
+      mmsproxy="84.225.255.1"
+      mmsport="8080"
+      mmsc="http://mmsc.pgsm.hu/"
+      type="mms"
+      authtype="0"
+      mvno_match_data="Djuice"
+      mvno_type="spn"
+  />
+
+  <apn carrier="Djuice NET"
+      mcc="216"
+      mnc="01"
+      apn="net"
+      type="default"
+      authtype="0"
+      mvno_match_data="Djuice"
+      mvno_type="spn"
+  />
+
+  <apn carrier="Djuice WAP"
+      mcc="216"
+      mnc="01"
+      apn="wap"
+      proxy="84.225.255.1"
+      port="8080"
+      type="default"
+      authtype="0"
+      mvno_match_data="Djuice"
+      mvno_type="spn"
+  />
+
+  <apn carrier="T-Mobile H MMS"
       mcc="216"
       mnc="30"
-      apn="mms"
-      user="mms"
-      password="mms"
+      apn="internet.telekom"
       mmsc="http://mms.t-mobile.hu/servlets/mms"
       mmsproxy="212.51.126.10"
       mmsport="8080"
       type="mms"
+      authtype="1"
   />
 
-  <apn carrier="Web"
+  <apn carrier="T-Mobile H"
       mcc="216"
       mnc="30"
-      apn="wnw"
+      apn="internet.telekom"
       type="default,supl"
+      authtype="1"
   />
 
-  <apn carrier="VF internet"
+  <apn carrier="Vodafone Internet"
       mcc="216"
       mnc="70"
       apn="internet.vodafone.net"
       type="default,supl"
+      authtype="0"
+      mvno_match_data="21670xx2xxx"
+      mvno_type="imsi"
   />
 
   <apn carrier="Vodafone MMS"
       mcc="216"
       mnc="70"
       apn="mms.vodafone.net"
-      mmsc="http://mms.vodafone.hu/servlets/mms"
       mmsproxy="80.244.97.2"
       mmsport="8080"
+      mmsc="http://mms.vodafone.hu/servlets/mms"
       type="mms"
+      authtype="0"
+      mvno_match_data="21670xx2xxx"
+      mvno_type="imsi"
   />
 
-  <apn carrier="VMAX Internet"
+  <apn carrier="Vodafone Live!"
+      mcc="216"
+      mnc="70"
+      apn="wap.vodafone.net"
+      user="vodawap"
+      password="vodawap"
+      proxy="10.9.8.7"
+      port="8080"
+      type="default,supl"
+      authtype="1"
+      mvno_match_data="21670xx2xxx"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Vodafone Internet VitaMAX"
       mcc="216"
       mnc="70"
       apn="vitamax.internet.vodafone.net"
       type="default,supl"
+      mvno_match_data="21670xx1xxx"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Vodafone MMS"
+      mcc="216"
+      mnc="70"
+      apn="mms.vodafone.net"
+      mmsproxy="80.244.97.2"
+      mmsport="8080"
+      mmsc="http://mms.vodafone.hu/servlets/mms"
+      type="mms"
+      mvno_match_data="21670xx1xxx"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Vodafone Live! VitaMAX"
+      mcc="216"
+      mnc="70"
+      apn="vitamax.wap.vodafone.net"
+      user="vodawap"
+      password="vodawap"
+      proxy="10.9.8.7"
+      port="8080"
+      type="default,supl"
+      authtype="1"
+      mvno_match_data="21670xx1xxx"
+      mvno_type="imsi"
   />
 
   <apn carrier="HT Eronet WAP"
@@ -1518,35 +1658,35 @@
       type="default"
   />
 
-  <apn carrier="Orange MMS SN" 
-      mcc="608" 
-      mnc="01" 
-      apn="mms" 
-      user="mms" 
-      password="mms" 
-      mmsc="http://mmsalize/servlets/mms" 
-      mmsproxy="172.16.30.9" 
-      mmsport="8080" 
+  <apn carrier="Orange MMS SN"
+      mcc="608"
+      mnc="01"
+      apn="mms"
+      user="mms"
+      password="mms"
+      mmsc="http://mmsalize/servlets/mms"
+      mmsproxy="172.16.30.9"
+      mmsport="8080"
       type="mms"
   />
 
-  <apn carrier="Orange Wap SN" 
-      mcc="608" 
-      mnc="01" 
-      apn="wap" 
-      user="wap" 
-      password="wap" 
-      proxy="172.16.30.9" 
+  <apn carrier="Orange Wap SN"
+      mcc="608"
+      mnc="01"
+      apn="wap"
+      user="wap"
+      password="wap"
+      proxy="172.16.30.9"
       port="8080"
       type="default"
   />
 
-  <apn carrier="Orange Web SN" 
-      mcc="608" 
-      mnc="01" 
-      apn="internet" 
-      user="internet" 
-      password="internet" 
+  <apn carrier="Orange Web SN"
+      mcc="608"
+      mnc="01"
+      apn="internet"
+      user="internet"
+      password="internet"
       type="default"
   />
 
@@ -2354,11 +2494,13 @@
       type="mms"
   />
 
-  <apn carrier="TDC"
+  <apn carrier="TDC Internet"
       mcc="238"
       mnc="01"
       apn="internet"
       type="default,supl"
+      mvno_match_data="2380101xxxxxxxx"
+      mvno_type="imsi"
   />
 
   <apn carrier="TDC MMS"
@@ -2369,6 +2511,29 @@
       mmsproxy="194.182.251.15"
       mmsport="8080"
       type="mms"
+      mvno_match_data="2380101xxxxxxxx"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Telmore Internet"
+      mcc="238"
+      mnc="01"
+      apn="internet"
+      type="default,supl"
+      mvno_type="spn"
+      mvno_match_data="TELMORE"
+  />
+
+  <apn carrier="Telmore MMS"
+      mcc="238"
+      mnc="01"
+      apn="mms"
+      mmsproxy="194.182.251.15"
+      mmsport="8080"
+      mmsc="http://192.168.241.114:8002"
+      type="mms"
+      mvno_type="spn"
+      mvno_match_data="TELMORE"
   />
 
   <apn carrier="Telenor Internet"
@@ -2388,6 +2553,48 @@
       type="mms"
   />
 
+  <apn carrier="BiBoB Internet profil"
+      mcc="238"
+      mnc="02"
+      apn="internet.bibob.dk"
+      type="default,supl"
+      mvno_type="spn"
+      mvno_match_data="BiBoB"
+  />
+
+  <apn carrier="BiBoB"
+      mcc="238"
+      mnc="02"
+      apn="mms.bibob.dk"
+      mmsproxy="212.88.64.8"
+      mmsport="8080"
+      mmsc="http://mms.telenor.dk"
+      type="mms"
+      mvno_type="spn"
+      mvno_match_data="BiBoB"
+  />
+
+  <apn carrier="CBB Internet"
+      mcc="238"
+      mnc="02"
+      apn="internet"
+      type="default,supl"
+      mvno_type="spn"
+      mvno_match_data="CBB Mobil"
+  />
+
+  <apn carrier="CBB MMS"
+      mcc="238"
+      mnc="02"
+      apn="telenor"
+      mmsproxy="212.88.64.8"
+      mmsport="8080"
+      mmsc="http://mms.telenor.dk"
+      type="mms"
+      mvno_type="spn"
+      mvno_match_data="CBB Mobil"
+  />
+
   <apn carrier="3"
       mcc="238"
       mnc="06"
@@ -2398,11 +2605,22 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="Telia Internet"
+  <apn carrier="Telia SurfPort"
       mcc="238"
       mnc="20"
       apn="www.internet.mtelia.dk"
       type="default,supl"
+      mvno_type="imsi"
+      mvno_match_data="2382010x"
+  />
+
+  <apn carrier="Telia SurfPort"
+      mcc="238"
+      mnc="20"
+      apn="www.internet.mtelia.dk"
+      type="default,supl"
+      mvno_type="imsi"
+      mvno_match_data="2382030x"
   />
 
   <apn carrier="Telia MMS"
@@ -2413,6 +2631,62 @@
       mmsproxy="193.209.134.131"
       mmsport="8080"
       type="mms"
+      mvno_type="imsi"
+      mvno_match_data="2382010x"
+  />
+
+  <apn carrier="Telia MMS"
+      mcc="238"
+      mnc="20"
+      apn="www.mms.mtelia.dk"
+      mmsc="http://mms.telia.dk"
+      mmsproxy="193.209.134.131"
+      mmsport="8080"
+      type="mms"
+      mvno_type="imsi"
+      mvno_match_data="2382030x"
+  />
+
+  <apn carrier="Call me Internet"
+      mcc="238"
+      mnc="20"
+      apn="webSP"
+      type="default,supl"
+      mvno_type="spn"
+      mvno_match_data="Call me"
+  />
+
+  <apn carrier="Call me MMS"
+      mcc="238"
+      mnc="20"
+      apn="mmsSP"
+      mmsproxy="193.209.134.131"
+      mmsport="8080"
+      mmsc="http://mms.telia.dk"
+      type="mms"
+      mvno_type="spn"
+      mvno_match_data="Call me"
+  />
+
+  <apn carrier="DLG Tele GPRS"
+      mcc="238"
+      mnc="20"
+      apn="webSP"
+      type="default,supl"
+      mvno_type="spn"
+      mvno_match_data="DLG Tele"
+  />
+
+  <apn carrier="DLG Tele MMS"
+      mcc="238"
+      mnc="20"
+      apn="mmsSP"
+      mmsproxy="193.209.134.131"
+      mmsport="8080"
+      mmsc="http://mms.telia.dk"
+      type="mms"
+      mvno_type="spn"
+      mvno_match_data="DLG Tele"
   />
 
   <apn carrier="Telenor Internet"
@@ -2453,21 +2727,23 @@
 
   <apn carrier="Halebop Internet"
       mcc="240"
-      mnc="017"
+      mnc="01"
       apn="halebop.telia.se"
       type="default,supl"
+      mvno_match_data="240017xxxxxxxxx"
+      mvno_type="imsi"
   />
 
   <apn carrier="Halebop MMS"
       mcc="240"
-      mnc="017"
+      mnc="01"
       apn="mms.telia.se"
-      user="mms"
-      password="telia"
       mmsc="http://mmss"
       mmsproxy="193.209.134.132"
-      mmsport="9201"
+      mmsport="80"
       type="mms"
+      mvno_match_data="240017xxxxxxxxx"
+      mvno_type="imsi"
   />
 
   <apn carrier="3"
@@ -2480,35 +2756,98 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="Telenor Mobilsurf"
+  <apn carrier="3"
       mcc="240"
       mnc="04"
-      apn="services.telenor.se"
-      proxy="172.30.253.241"
-      port="8799"
-      mmsc="http://mms"
-      mmsproxy="172.30.253.241"
+      apn="data.tre.se"
+      mmsc="http://mms.tre.se"
+      mmsproxy="mmsproxy.tre.se"
       mmsport="8799"
       type="default,supl,mms"
   />
 
-  <apn carrier="Telenor MMS"
-      mcc="240"
-      mnc="06"
-      apn="services.telenor.se"
-      mmsc="http://mms"
-      mmsproxy="173.30.253.241"
-      mmsport="8799"
-      type="mms"
-  />
-
   <apn carrier="Telenor Mobilsurf"
       mcc="240"
-      mnc="06"
+      mnc="04"
       apn="services.telenor.se"
-      proxy="173.30.253.241"
-      port="8799"
+      mmsc="http://mms"
+      mmsproxy="172.30.253.241"
+      mmsport="8799"
+      type="default,supl,mms"
+      mvno_match_data="Telenor SE"
+      mvno_type="spn"
+  />
+
+  <apn carrier="Tele2 Internet 4G"
+      mcc="240"
+      mnc="05"
+      apn="4g.tele2.se"
+      mmsc="http://mmsc.tele2.se"
+      mmsproxy="130.244.202.30"
+      mmsport="8080"
+      type="default,supl,mms"
+  />
+
+  <apn carrier="Tele2"
+      mcc="240"
+      mnc="05"
+      apn="internet.tele2.se"
+      mmsc="http://mmsc.tele2.se"
+      mmsproxy="130.244.202.30"
+      mmsport="8080"
+      type="default,supl,mms"
+  />
+
+  <apn carrier="Telia SE MMS"
+      mcc="240"
+      mnc="05"
+      apn="mms.telia.se"
+      mmsc="http://mmss/"
+      mmsproxy="193.209.134.132"
+      mmsport="80"
+      type="mms"
+      mvno_match_data="Telia"
+      mvno_type="spn"
+  />
+
+  <apn carrier="Telia SurfPort"
+      mcc="240"
+      mnc="05"
+      apn="online.telia.se"
       type="default,supl"
+      mvno_match_data="Telia"
+      mvno_type="spn"
+  />
+
+  <apn carrier="Halebop Internet"
+      mcc="240"
+      mnc="05"
+      apn="halebop.telia.se"
+      type="default,supl"
+      mvno_match_data="Halebop"
+      mvno_type="spn"
+  />
+
+  <apn carrier="Halebop MMS"
+      mcc="240"
+      mnc="05"
+      apn="mms.telia.se"
+      mmsc="http://mmss"
+      mmsproxy="193.209.134.132"
+      mmsport="80"
+      type="mms"
+      mvno_match_data="Halebop"
+      mvno_type="spn"
+  />
+
+  <apn carrier="Tele2 Internet 4G"
+      mcc="240"
+      mnc="07"
+      apn="4g.tele2.se"
+      mmsc="http://mmsc.tele2.se"
+      mmsproxy="130.244.202.30"
+      mmsport="8080"
+      type="default,supl,mms"
   />
 
   <apn carrier="Tele2"
@@ -2521,42 +2860,38 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="Telenor Mobilsurf"
+  <apn carrier="Tele2 Internet"
       mcc="240"
-      mnc="08"
-      apn="services.telenor.se"
-      proxy="172.30.253.241"
-      port="8799"
+      mnc="07"
+      apn="internet.tele2.no"
+      user="wap"
+      password="wap"
       type="default,supl"
+      authtype="1"
+      mvno_match_data="2400768xxxxxxxx"
+      mvno_type="imsi"
   />
 
-  <apn carrier="Telenor MMS"
+  <apn carrier="Tele2 MMS"
+      mcc="240"
+      mnc="07"
+      apn="internet.tele2.no"
+      mmsproxy="193.12.40.14"
+      mmsport="8080"
+      mmsc="http://mmsc.tele2.no"
+      type="mms"
+      mvno_match_data="2400768xxxxxxxx"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Telenor Mobilsurf"
       mcc="240"
       mnc="08"
       apn="services.telenor.se"
       mmsc="http://mms"
       mmsproxy="172.30.253.241"
       mmsport="8799"
-      type="mms"
-  />
-
-  <apn carrier="Telenor MMS"
-      mcc="240"
-      mnc="09"
-      apn="services.telenor.se"
-      mmsc="http://mms"
-      mmsproxy="173.30.253.241"
-      mmsport="8799"
-      type="mms"
-  />
-
-  <apn carrier="TelenorMobilsurf"
-      mcc="240"
-      mnc="09"
-      apn="services.telenor.se"
-      proxy="173.30.253.241"
-      port="8799"
-      type="default,supl"
+      type="default,supl,mms"
   />
 
   <apn carrier="Spring data"
@@ -2576,11 +2911,45 @@
       type="mms"
   />
 
+  <apn carrier="Tele2 Internet 4G"
+      mcc="240"
+      mnc="24"
+      apn="4g.tele2.se"
+      mmsc="http://mmsc.tele2.se"
+      mmsproxy="130.244.202.30"
+      mmsport="8080"
+      type="default,supl,mms"
+  />
+
+  <apn carrier="Tele2"
+      mcc="240"
+      mnc="24"
+      apn="internet.tele2.se"
+      mmsc="http://mmsc.tele2.se"
+      mmsproxy="130.244.202.30"
+      mmsport="8080"
+      type="default,supl,mms"
+  />
+
+  <apn carrier="Telenor Mobilsurf"
+      mcc="240"
+      mnc="24"
+      apn="services.telenor.se"
+      mmsc="http://mms"
+      mmsproxy="172.30.253.241"
+      mmsport="8799"
+      type="default,supl,mms"
+      mvno_match_data="Telenor SE"
+      mvno_type="spn"
+  />
+
   <apn carrier="Ventelo Internett"
       mcc="242"
       mnc="01"
       apn="internet.ventelo.no"
       type="default,supl"
+      mvno_match_data="24201700xxxxxxx"
+      mvno_type="imsi"
   />
 
   <apn carrier="Ventelo MMS"
@@ -2593,6 +2962,9 @@
       mmsproxy="10.10.10.11"
       mmsport="8080"
       type="mms"
+      authtype="1"
+      mvno_match_data="24201700xxxxxxx"
+      mvno_type="imsi"
   />
 
   <apn carrier="Telenor"
@@ -2605,21 +2977,38 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="NetCom MMS"
+  <apn carrier="NetCom"
       mcc="242"
       mnc="02"
-      apn="mms.netcom.no"
+      apn="netcom"
       mmsc="http://mm/"
       mmsproxy="212.169.66.4"
       mmsport="8080"
-      type="mms"
+      type="default,supl,mms"
   />
 
-  <apn carrier="NetCom Internett"
+  <apn carrier="Chess MMS"
       mcc="242"
       mnc="02"
-      apn="wap"
+      apn="netcom"
+      user="mms"
+      password="netcom"
+      mmsproxy="212.169.66.4"
+      mmsport="8080"
+      mmsc="http://mm/"
+      type="mms"
+      authtype="1"
+      mvno_match_data="2420256xxxxxxxx"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Chess Internett"
+      mcc="242"
+      mnc="02"
+      apn="netcom"
       type="default,supl"
+      mvno_match_data="2420256xxxxxxxx"
+      mvno_type="imsi"
   />
 
   <apn carrier="Tele2 Internett"
@@ -2660,7 +3049,7 @@
       mcc="244"
       mnc="03"
       apn="mms"
-      mmsc="http://mmsc.dnafinland.fi/"
+      mmsc="http://mmsc.dna.fi"
       mmsproxy="10.1.1.2"
       mmsport="8080"
       type="mms"
@@ -2692,7 +3081,6 @@
       type="default,supl"
   />
 
-
   <apn carrier="Elisa MMS"
       mcc="244"
       mnc="05"
@@ -2703,6 +3091,27 @@
       type="mms"
   />
 
+  <apn carrier="Saunalahti Internet"
+      mcc="244"
+      mnc="05"
+      apn="internet.saunalahti"
+      type="default,supl"
+      mvno_match_data="2440541"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Saunalahti MMS"
+      mcc="244"
+      mnc="05"
+      apn="mms.saunalahti.fi"
+      mmsc="http://mms.saunalahti.fi:8002/"
+      mmsproxy="62.142.4.197"
+      mmsport="8080"
+      type="mms"
+      mvno_match_data="2440541"
+      mvno_type="imsi"
+  />
+
   <apn carrier="TDC Internet"
       mcc="244"
       mnc="10"
@@ -2733,7 +3142,7 @@
       mcc="244"
       mnc="12"
       apn="mms"
-      mmsc="http://mmsc.dnafinland.fi/"
+      mmsc="http://mmsc.dna.fi"
       mmsproxy="10.1.1.2"
       mmsport="8080"
       type="mms"
@@ -2820,7 +3229,6 @@
       type="default,supl"
   />
 
-
   <apn carrier="SONERA MMS"
       mcc="244"
       mnc="91"
@@ -3545,6 +3953,7 @@
       apn="net2.vodafone.pt"
       user="vodafone"
       password="vodafone"
+      authtype="1"
       proxy="iproxy.vodafone.pt"
       port="80"
       mmsc="http://mms.vodafone.pt/servlets/mms"
@@ -3553,21 +3962,38 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="Optimus Internet"
+  <apn carrier="ZON Internet"
+      mcc="268"
+      mnc="01"
+      apn="internet.zon.pt"
+      type="default,supl,mms"
+      mvno_match_data="ZON"
+      mvno_type="spn"
+  />
+
+  <apn carrier="ZON MMS"
+      mcc="268"
+      mnc="01"
+      apn="vas.zon.pt"
+      user="vas"
+      password="vas"
+      authtype="1"
+      mmsc="http://mms/servlets/mms"
+      mmsproxy="213.030.027.063"
+      mmsport="8799"
+      type="mms"
+      mvno_match_data="ZON"
+      mvno_type="spn"
+  />
+
+  <apn carrier="PortalOptimus"
       mcc="268"
       mnc="03"
       apn="umts"
-      type="default"
-  />
-
-  <apn carrier="Optimus MMS"
-      mcc="268"
-      mnc="03"
-      apn="mms"
       mmsc="http://mmsc:10021/mmsc"
-      mmsproxy="62.169.66.1"
+      mmsproxy="62.169.66.5"
       mmsport="8799"
-      type="mms"
+      type="default,supl,mms"
   />
 
   <apn carrier="tmn internet"
@@ -3583,6 +4009,7 @@
       apn="mmsc.tmn.pt"
       user="tmn"
       password="tmnnet"
+      authtype="1"
       mmsc="http://mmsc/"
       mmsproxy="10.111.2.16"
       mmsport="8080"
@@ -3823,19 +4250,20 @@
       type="default,supl"
   />
 
-  <apn carrier="M-Tel"
+  <apn carrier="MTel"
       mcc="284"
       mnc="01"
-      apn="wap-gprs.mtel.bg"
+      apn="inet-gprs.mtel.bg"
       type="default,supl"
   />
 
-  <apn carrier="M-Tel MMS"
+  <apn carrier="MTel MMS"
       mcc="284"
       mnc="01"
       apn="mms-gprs.mtel.bg"
       user="mtel"
       password="mtel"
+      authtype="1"
       mmsc="http://mmsc/"
       mmsproxy="10.150.0.33"
       mmsport="8080"
@@ -3848,6 +4276,7 @@
       apn="internet.vivacom.bg"
       user="vivacom"
       password="vivacom"
+      authtype="1"
       type="default,supl"
   />
 
@@ -3857,6 +4286,7 @@
       apn="mms.vivacom.bg"
       user="mms"
       password="mms"
+      authtype="1"
       mmsc="http://mmsc.vivacom.bg"
       mmsproxy="192.168.123.123"
       mmsport="8080"
@@ -3867,6 +4297,9 @@
       mcc="284"
       mnc="05"
       apn="globul"
+      authtype="1"
+      proxy="192.168.88.11"
+      port="8004"
       type="default,supl"
   />
 
@@ -4787,6 +5220,23 @@
       type="default,supl,mms"
   />
 
+  <apn carrier="Viaero Internet"
+      mcc="310"
+      mnc="450"
+      apn="internet.vedge.com"
+      type="default,supl"
+  />
+
+  <apn carrier="Viaero MMS"
+      mcc="310"
+      mnc="450"
+      apn="mms"
+      mmsc="http://mms.viaero.com"
+      mmsproxy="10.168.3.23"
+      mmsport="9401"
+      type="mms"
+  />
+
   <apn carrier="DataConnect"
       mcc="310"
       mnc="470"
@@ -5001,28 +5451,27 @@
   />
 
 
-  <apn carrier="WEB 2"
+  <apn carrier="Web 2"
       mcc="310"
       mnc="770"
       apn="i2.iwireless.com"
       type="default,supl"
   />
 
+  <apn carrier="Web 1"
+      mcc="310"
+      mnc="770"
+      apn="wap1.iwireless.com"
+      proxy="209.4.229.31"
+      port="9401"
+      type="default,supl"
+  />
+
   <apn carrier="Picture Messaging"
       mcc="310"
       mnc="770"
       apn="wap1.iwireless.com"
       mmsc="http://mmsc.iwireless.dataonair.net:6672"
-      mmsproxy="209.4.229.31"
-      mmsport="9401"
-      type="mms"
-  />
-
-  <apn carrier="PIAPicture Messaging"
-      mcc="310"
-      mnc="770"
-      apn="wap9.iwireless.com"
-      mmsc="http://mmsc.iwireless.dataonair.net:6672"
       mmsproxy="209.4.229.32"
       mmsport="9401"
       type="mms"
@@ -12591,77 +13040,76 @@
       type="mms"
   />
 
-  <apn carrier="Orange Internet UG" 
-      mcc="641" 
-      mnc="14" 
-      apn="orange.ug" 
+  <apn carrier="Orange Internet UG"
+      mcc="641"
+      mnc="14"
+      apn="orange.ug"
       type="default"
   />
  
-  <apn carrier="Orange MMS" 
-      mcc="641" 
-      mnc="14" 
+  <apn carrier="Orange MMS"
+      mcc="641"
+      mnc="14"
       apn="orangemms"
       mmsc="http://mms/"
       type="mms"
   />
 
-
-  <apn carrier="Orange MMS" 
-      apn="orangemms" 
-      user="mmsc" 
-      password="mmsc" 
-      mmsc="http://10.2.1.20:8514" 
-      mmsproxy="10.2.1.20" 
-      mmsport="8080" 
-      mcc="617" 
-      mnc="01" 
-      type="mms" 
+  <apn carrier="Orange MMS"
+      apn="orangemms"
+      user="mmsc"
+      password="mmsc"
+      mmsc="http://10.2.1.20:8514"
+      mmsproxy="10.2.1.20"
+      mmsport="8080"
+      mcc="617"
+      mnc="01"
+      type="mms"
   />
 
-  <apn carrier="Orange Internet" 
-      apn="orange" 
-      mcc="617" 
-      mnc="01" 
-      type="default" 
+  <apn carrier="Orange Internet"
+      apn="orange"
+      mcc="617"
+      mnc="01"
+      type="default"
   />
 
-  <apn carrier="Orange MMS" 
-      apn="mms.orange.md" 
-      mmsc="http://mms/mms" 
-      mmsproxy="192.168.127.125" 
-      mmsport="3128" 
-      mcc="259" 
-      mnc="01" 
-      type="mms" 
+  <apn carrier="Orange MMS"
+      apn="mms.orange.md"
+      mmsc="http://mms/mms"
+      mmsproxy="192.168.127.125"
+      mmsport="3128"
+      mcc="259"
+      mnc="01"
+      type="mms"
   />
 
-  <apn carrier="Orange IMO" 
-      apn="wap.orange.md" 
-      proxy="192.168.127.124" 
-      mmsport="3128" 
-      mcc="259" 
-      mnc="01" 
-      type="mms" 
+  <apn carrier="Orange IMO"
+      apn="wap.orange.md"
+      proxy="192.168.127.124"
+      mmsport="3128"
+      mcc="259"
+      mnc="01"
+      type="mms"
   />
 
-  <apn carrier="Orange MMS" 
-      apn="orange.mms" 
-      user="orange" 
-      password="orange" 
-      mmsc="http://10.10.10.35:38090/was" 
-      mmsproxy="10.10.10.36" 
-      mmsport="8080" 
-      mcc="614" 
-      mnc="04" 
-      type="mms" 
+  <apn carrier="Orange MMS"
+      apn="orange.mms"
+      user="orange"
+      password="orange"
+      mmsc="http://10.10.10.35:38090/was"
+      mmsproxy="10.10.10.36"
+      mmsport="8080"
+      mcc="614"
+      mnc="04"
+      type="mms"
   />
 
-  <apn carrier="Orange Internet" 
-      apn="orange.ne" 
-      mcc="614" 
-      mnc="04" 
-      type="default" 
+  <apn carrier="Orange Internet"
+      apn="orange.ne"
+      mcc="614"
+      mnc="04"
+      type="default"
   />
 
   <apn carrier="3G Portal"
@@ -13062,7 +13510,7 @@
       mmsc="http://192.168.193.134:38090/was"
       mmsproxy="192.168.194.73"
       mmsport="8080"
-       type="mms"
+      type="mms"
   />
 
   <apn carrier="MCI-GPRS"
@@ -17668,165 +18116,165 @@
       type="mms"
   />
 
-  <apn carrier="Orange Armenia MMS" 
-      mcc="283" 
-      mnc="10" 
-      apn="mms" 
-      mmsc="http://mms/" 
-      mmsproxy="192.168.220.251" 
-      mmsport="3128" 
-      type="mms" 
+  <apn carrier="Orange Armenia MMS"
+      mcc="283"
+      mnc="10"
+      apn="mms"
+      mmsc="http://mms/"
+      mmsproxy="192.168.220.251"
+      mmsport="3128"
+      type="mms"
       authtype="1"
   />
 
-  <apn carrier="Orange Armenia Internet" 
-      mcc="283" 
-      mnc="10" 
-      apn="Internet" 
-      type="default" 
+  <apn carrier="Orange Armenia Internet"
+      mcc="283"
+      mnc="10"
+      apn="Internet"
+      type="default"
       authtype="1"
   />
 
-  <apn carrier="Orange BW MMS" 
-      mcc="652" 
-      mnc="02" 
-      apn="mms.orange.co.bw" 
-      mmsc="http://10.0.0.242/servlets/mms" 
-      mmsproxy="10.0.0.226" 
-      mmsport="8080" 
-      type="mms"
-  />
-
-  <apn carrier="Orange WAP BW" 
-      mcc="652" 
-      mnc="02" 
-      apn="internet.orange.co.bw"
-      proxy="10.0.0.226" 
-      port="8080"  
-      type="default"
-  />
-
-  <apn carrier="Orangeweb" 
-      mcc="340" 
-      mnc="01" 
-      apn="orangeweb" 
-      user="orange" 
-      password="orange" 
-      type="default"
-  />
-
-  <apn carrier="Omms CI" 
-      mcc="612" 
-      mnc="03" 
-      apn="orangecimms" 
-      user="mms" 
-      password="mms"
-      mmsc="http://172.20.6.1/servlets/mms" 
-      mmsproxy="172.20.4.33" 
-      mmsport="8080" 
-      type="mms"
-  />
-
-  <apn carrier="OWORLD CI" 
-      mcc="612" 
-      mnc="03" 
-      apn="orangeciwap" 
-      user="wap" 
-      password="wap" 
-      proxy="172.20.4.33" 
-      port="8080" 
-      type="default"
-  />
-
-  <apn carrier="Orange DO MMS" 
-      mcc="370" 
-      mnc="01" 
-      apn="orangeworld" 
-      mmsc="http://mmr.orangewi.com/servlets/mms" 
-      mmsproxy="172.16.126.70" 
+  <apn carrier="Orange BW MMS"
+      mcc="652"
+      mnc="02"
+      apn="mms.orange.co.bw"
+      mmsc="http://10.0.0.242/servlets/mms"
+      mmsproxy="10.0.0.226"
       mmsport="8080"
       type="mms"
   />
 
-  <apn carrier="Orange DO" 
-      mcc="370" 
-      mnc="01" 
-      apn="orangenet.com.do" 
+  <apn carrier="Orange WAP BW"
+      mcc="652"
+      mnc="02"
+      apn="internet.orange.co.bw"
+      proxy="10.0.0.226"
+      port="8080"
       type="default"
   />
 
-  <apn carrier="Orange CM" 
-      mcc="624" 
-      mnc="02" 
-      apn="orangecmgprs" 
-      user="orange" 
+  <apn carrier="Orangeweb"
+      mcc="340"
+      mnc="01"
+      apn="orangeweb"
+      user="orange"
       password="orange"
-      proxy="192.168.122.101" 
-      port="8080" 
-      mmsc="http://mms.orange.cm" 
-      mmsproxy="192.168.122.101" 
-      mmsport="8080" 
+      type="default"
+  />
+
+  <apn carrier="Omms CI"
+      mcc="612"
+      mnc="03"
+      apn="orangecimms"
+      user="mms"
+      password="mms"
+      mmsc="http://172.20.6.1/servlets/mms"
+      mmsproxy="172.20.4.33"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="OWORLD CI"
+      mcc="612"
+      mnc="03"
+      apn="orangeciwap"
+      user="wap"
+      password="wap"
+      proxy="172.20.4.33"
+      port="8080"
+      type="default"
+  />
+
+  <apn carrier="Orange DO MMS"
+      mcc="370"
+      mnc="01"
+      apn="orangeworld"
+      mmsc="http://mmr.orangewi.com/servlets/mms"
+      mmsproxy="172.16.126.70"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="Orange DO"
+      mcc="370"
+      mnc="01"
+      apn="orangenet.com.do"
+      type="default"
+  />
+
+  <apn carrier="Orange CM"
+      mcc="624"
+      mnc="02"
+      apn="orangecmgprs"
+      user="orange"
+      password="orange"
+      proxy="192.168.122.101"
+      port="8080"
+      mmsc="http://mms.orange.cm"
+      mmsproxy="192.168.122.101"
+      mmsport="8080"
       type="default,mms"
   />
 
-  <apn carrier="Orange net KE" 
-      mcc="639" 
-      mnc="07" 
-      apn="bew.orange.co.ke" 
+  <apn carrier="Orange net KE"
+      mcc="639"
+      mnc="07"
+      apn="bew.orange.co.ke"
       type="default"
   />
 
-  <apn carrier="Orange RE" 
-      mcc="647" 
-      mnc="00" 
-      apn="orangerun" 
-      user="orange" 
-      password="orange" 
+  <apn carrier="Orange RE"
+      mcc="647"
+      mnc="00"
+      apn="orangerun"
+      user="orange"
+      password="orange"
       type="default"
   />
 
-  <apn carrier="Orange MG MMS" 
-      mcc="646" 
-      mnc="02" 
-      apn="orangemms" 
-      user="mms" 
-      password="orange" 
-      mmsc="http://10.152.10.70.38090" 
-      mmsproxy="10.150.0.115" 
-      mmsport="8080" 
+  <apn carrier="Orange MG MMS"
+      mcc="646"
+      mnc="02"
+      apn="orangemms"
+      user="mms"
+      password="orange"
+      mmsc="http://10.152.10.70.38090"
+      mmsproxy="10.150.0.115"
+      mmsport="8080"
       type="mms"
   />
 
   <apn carrier="Orange World MG"
-      mcc="646" 
-      mnc="02" 
-      apn="orangeworld" 
-      user="world" 
-      password="orange" 
-      proxy="10.150.0.115" 
-      port="8080" 
+      mcc="646"
+      mnc="02"
+      apn="orangeworld"
+      user="world"
+      password="orange"
+      proxy="10.150.0.115"
+      port="8080"
       type="default"
   />
 
-  <apn carrier="Orange ML MMS" 
-      mcc="610" 
-      mnc="02" 
-      apn="mms" 
-      user="mms" 
+  <apn carrier="Orange ML MMS"
+      mcc="610"
+      mnc="02"
+      apn="mms"
+      user="mms"
       password="mms"
-      mmsc="http://10.109.6.2/servlets/mms" 
-      mmsproxy="10.109.4.35" 
-      mmsport="8080" 
+      mmsc="http://10.109.6.2/servlets/mms"
+      mmsproxy="10.109.4.35"
+      mmsport="8080"
       type="mms"
   />
 
-  <apn carrier="Orange Wap ML" 
-      mcc="610" 
-      mnc="02" 
-      apn="wap" 
-      user="wap" 
-      password="wap" 
-      proxy="10.109.4.35" 
+  <apn carrier="Orange Wap ML"
+      mcc="610"
+      mnc="02"
+      apn="wap"
+      user="wap"
+      password="wap"
+      proxy="10.109.4.35"
       port="8080"
       type="default"
   />